Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(ui): move dropdown to @codeimageui #188

Merged
merged 2 commits into from
Apr 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/spotty-goats-applaud.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@codeimage/app': patch
'@codeimage/ui': patch
---

refactor: move dropdown to @codeimage/ui
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import {createMemo, createSignal, For, from, JSXElement} from 'solid-js';
import {Button, HStack} from '@codeimage/ui';
import {Button, FadeInOutTransition, HStack, PopoverPanel} from '@codeimage/ui';
import {HintIcon} from '../Icons/Hint';
import {useI18n} from '@codeimage/locale';
import {AppLocaleEntries} from '../../i18n';
import {Popover, PopoverButton} from 'solid-headless';
import {PopoverPanel} from '../../ui/Dropdown/DropdownMenu';
import {useFloating} from '../../core/floating-ui/floating-ui';
import * as styles from './KeyboardShortcuts.css';
import {FadeInOutTransition} from '@codeimage/ui';
import {offset} from '@floating-ui/dom';
import {PortalHostInjector} from '../../ui/PortalHost/PortalHost';
import * as frame from '@codeimage/store/frame';
Expand Down
4 changes: 2 additions & 2 deletions apps/codeimage/src/components/ShadowField/ShadowField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import {Component} from 'solid-js';
import {useFloating} from '../../core/floating-ui/floating-ui';
import {Popover, PopoverButton} from 'solid-headless';
import {sprinkles, textFieldStyles, themeVars} from '@codeimage/ui';
import {DropdownMenu} from '../../ui/Dropdown/DropdownPanel';
import {DropdownPortal} from '../../ui/Dropdown/DropdownPortal';
import {DropdownMenu} from '@codeimage/ui';
import {DropdownPortal} from '@codeimage/ui';
import {ShadowForm} from './ShadowForm';
import clsx from 'clsx';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ import {Dynamic} from 'solid-js/web';
import {omitProps} from 'solid-use';
import {BaseTerminalProps} from '../TerminalHost';
import {appEnvironment} from '../../../core/configuration';
import {Box} from '@codeimage/ui';
import {Box, FadeInOutTransition} from '@codeimage/ui';
import * as styles from '../terminal.css';
import {CodeImageLogo} from '../../Icons/CodeImageLogo';
import {FadeInOutTransition} from '../../../../../../packages/ui/src/lib/primitives/Transition/Transition';

interface DynamicTerminalProps extends BaseTerminalProps {
type: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import {Popover, PopoverButton} from 'solid-headless';
import {Button, FadeInOutTransition} from '@codeimage/ui';
import {
Button,
DropdownItem,
DropdownMenu,
FadeInOutTransition,
} from '@codeimage/ui';
import {For} from 'solid-js';
import {useFloating} from '../../core/floating-ui/floating-ui';
import {offset} from '@floating-ui/dom';
import {useI18n} from '@codeimage/locale';
import {DropdownItem} from '../../ui/Dropdown/DropdownItem';
import {DropdownMenu} from '../../ui/Dropdown/DropdownMenu';
import {AppLocaleEntries} from '../../i18n';
import {SvgIcon} from '../../ui/SvgIcon/SvgIcon';

Expand Down
32 changes: 0 additions & 32 deletions apps/codeimage/src/ui/Dropdown/DropdownPanel.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {style} from '@vanilla-extract/css';
import {buttonStyles, themeVars} from '@codeimage/ui';
import * as buttonStyles from '../Button/Button.css';
import {themeVars} from '../../theme';

export const dropdownPanel = style({
overflow: 'hidden',
Expand Down
26 changes: 26 additions & 0 deletions packages/ui/src/lib/primitives/Dropdown/DropdownPanel.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// type DropdownMenuPanel = PopoverPanelProps<'div'> & {
// title?: string;
// };
//
// export const DropdownMenu: Component<DropdownMenuPanel> = props => {
// return (
// <PopoverPanel
// as={'div'}
// unmount={false}
// class={styles.dropdownPanel}
// {...props}
// >
// <Box display={'flex'} padding={'3'}>
// <Show when={props.title}>
// <Text as={'div'} weight="semibold" size={'sm'}>
// {props.title}
// </Text>
// </Show>
// </Box>
//
// <Menu>
// <MenuItem as={'div'}>{props.children}</MenuItem>
// </Menu>
// </PopoverPanel>
// );
// };
5 changes: 5 additions & 0 deletions packages/ui/src/lib/primitives/Dropdown/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export * as dropdownStyles from './Dropdown.css';
export * from './DropdownItem';
export * from './DropdownMenu';
// export * from './DropdownPanel';
export * from './DropdownPortal';
8 changes: 8 additions & 0 deletions packages/ui/src/lib/primitives/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,11 @@ export {
type DialogPanelProps,
type DialogTitleProps,
} from './Dialog';

export {
dropdownStyles,
DropdownItem,
DropdownPortal,
PopoverPanel,
DropdownMenu,
} from './Dropdown';