Charles Bochet
647c32ff3e
## Summary
- **Eliminate `ICON_SIZES` / `ICON_STROKES` constants**: all icon
dimensions are now resolved at runtime via
`resolveThemeVariableAsNumber(themeCssVariables.icon.size.X)`, ensuring
values always come from computed CSS variables
- **No more consumer imports from `twenty-ui/theme`**: moved
`ColorSchemeContext`, `ColorSchemeProvider`, `ThemeColor`,
`MAIN_COLOR_NAMES`, `getNextThemeColor`, `AnimationDuration` to
`twenty-ui/theme-constants`
- **Remove `ThemeContext` / `ThemeContextProvider` / `ThemeProvider` /
`ThemeType`**: replaced across ~300 files with `themeCssVariables` (for
CSS contexts) or `resolveThemeVariable` / `resolveThemeVariableAsNumber`
(for JS runtime values)
- **Simplify provider chain**: only `ColorSchemeProvider` remains — it
toggles `light`/`dark` class on `document.documentElement` and provides
`colorScheme` via React context
- **Fix pre-existing test failures**: `useIcons.test.ts`
(non-configurable ES module spy) and
`turnRecordFilterGroupIntoGqlOperationFilter.test.ts`
(`Omit<RecordFilter, 'id'>` type mismatch)
### Theme access pattern (before → after)
| Context | Before | After |
|---------|--------|-------|
| CSS (Linaria) | `${({ theme }) => theme.font.color.primary}` |
`${themeCssVariables.font.color.primary}` |
| JS runtime (icon size, animation) | `theme.icon.size.md` /
`ICON_SIZES.md` |
`resolveThemeVariableAsNumber(themeCssVariables.icon.size.md)` |
| Color scheme check | `theme.name === 'dark'` |
`useContext(ColorSchemeContext).colorScheme === 'dark'` |
59 lines
2.2 KiB
TypeScript
59 lines
2.2 KiB
TypeScript
import { ActionMenuContextProvider } from '@/action-menu/contexts/ActionMenuContextProvider';
|
|
import { CommandMenuContainer } from '@/command-menu/components/CommandMenuContainer';
|
|
import { CommandMenuTopBar } from '@/command-menu/components/CommandMenuTopBar';
|
|
import { COMMAND_MENU_PAGES_CONFIG } from '@/command-menu/constants/CommandMenuPagesConfig';
|
|
import { commandMenuPageInfoState } from '@/command-menu/states/commandMenuPageInfoState';
|
|
import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState';
|
|
import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext';
|
|
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
|
|
import { styled } from '@linaria/react';
|
|
import { motion } from 'framer-motion';
|
|
import { useContext } from 'react';
|
|
import { isDefined } from 'twenty-shared/utils';
|
|
import { ThemeContext } from 'twenty-ui/theme-constants';
|
|
|
|
const StyledCommandMenuContent = styled.div`
|
|
flex: 1;
|
|
overflow-y: auto;
|
|
`;
|
|
|
|
export const CommandMenuRouter = () => {
|
|
const { theme } = useContext(ThemeContext);
|
|
const commandMenuPage = useAtomStateValue(commandMenuPageState);
|
|
const commandMenuPageInfo = useAtomStateValue(commandMenuPageInfoState);
|
|
|
|
const commandMenuPageComponent = isDefined(commandMenuPage) ? (
|
|
COMMAND_MENU_PAGES_CONFIG.get(commandMenuPage)
|
|
) : (
|
|
<></>
|
|
);
|
|
return (
|
|
<CommandMenuContainer>
|
|
<CommandMenuPageComponentInstanceContext.Provider
|
|
value={{ instanceId: commandMenuPageInfo.instanceId }}
|
|
>
|
|
<motion.div
|
|
initial={{ opacity: 0 }}
|
|
animate={{ opacity: 1 }}
|
|
exit={{ opacity: 0 }}
|
|
transition={{
|
|
duration: theme.animation.duration.instant,
|
|
delay: 0.1,
|
|
}}
|
|
>
|
|
<CommandMenuTopBar />
|
|
</motion.div>
|
|
<StyledCommandMenuContent>
|
|
<ActionMenuContextProvider
|
|
isInRightDrawer={true}
|
|
displayType="listItem"
|
|
actionMenuType="command-menu"
|
|
>
|
|
{commandMenuPageComponent}
|
|
</ActionMenuContextProvider>
|
|
</StyledCommandMenuContent>
|
|
</CommandMenuPageComponentInstanceContext.Provider>
|
|
</CommandMenuContainer>
|
|
);
|
|
};
|