diff --git a/src/frontend/apps/impress/src/components/quick-search/QuickSearchInput.tsx b/src/frontend/apps/impress/src/components/quick-search/QuickSearchInput.tsx index 374cfd1a7..d5cbf031b 100644 --- a/src/frontend/apps/impress/src/components/quick-search/QuickSearchInput.tsx +++ b/src/frontend/apps/impress/src/components/quick-search/QuickSearchInput.tsx @@ -44,7 +44,7 @@ export const QuickSearchInput = ({ $gap={spacing['2xs']} $padding={{ horizontal: 'base' }} > - {!loading && } + {!loading && } {loading && (
diff --git a/src/frontend/apps/impress/src/components/quick-search/QuickSearchItemContent.tsx b/src/frontend/apps/impress/src/components/quick-search/QuickSearchItemContent.tsx new file mode 100644 index 000000000..702a11ca0 --- /dev/null +++ b/src/frontend/apps/impress/src/components/quick-search/QuickSearchItemContent.tsx @@ -0,0 +1,44 @@ +import { ReactNode } from 'react'; + +import { useCunninghamTheme } from '@/cunningham'; + +import { Box } from '../Box'; + +export type QuickSearchItemContentProps = { + alwaysShowRight?: boolean; + left: ReactNode; + right?: ReactNode; +}; + +export const QuickSearchItemContent = ({ + alwaysShowRight = false, + left, + right, +}: QuickSearchItemContentProps) => { + const { spacingsTokens } = useCunninghamTheme(); + const spacings = spacingsTokens(); + + return ( + + + {left} + + + {right && ( + + {right} + + )} + + ); +}; diff --git a/src/frontend/apps/impress/src/components/quick-search/QuickSearchStyle.tsx b/src/frontend/apps/impress/src/components/quick-search/QuickSearchStyle.tsx index de6a574cc..c3dd72b55 100644 --- a/src/frontend/apps/impress/src/components/quick-search/QuickSearchStyle.tsx +++ b/src/frontend/apps/impress/src/components/quick-search/QuickSearchStyle.tsx @@ -24,12 +24,12 @@ export const QuickSearchStyle = createGlobalStyle` background: white; outline: none; - color: var(--c--theme--colors--greyscale-700); + color: var(--c--theme--colors--greyscale-1000); border-radius: 0; &::placeholder { - color: var(--c--theme--colors--greyscale-300); + color: var(--c--theme--colors--greyscale-500); } } @@ -66,8 +66,16 @@ export const QuickSearchStyle = createGlobalStyle` transition: all 150ms ease; transition-property: none; + .show-right-on-focus { + display: none; + } + + &:hover, &[data-selected='true'] { background: var(--c--theme--colors--greyscale-100); + .show-right-on-focus { + display: inherit; + } } &[data-disabled='true'] { @@ -126,34 +134,19 @@ export const QuickSearchStyle = createGlobalStyle` [cmdk-group-heading] { user-select: none; font-size: var(--c--theme--font--sizes--sm); - color: var(--c--theme--colors--greyscale-500); + color: var(--c--theme--colors--greyscale-700); font-weight: bold; display: flex; align-items: center; - margin: var(--c--theme--spacings--200W) 0; + margin-bottom: var(--c--theme--spacings--base); } [cmdk-empty] { } } -.inputContainer { - display: flex; - padding: 0 10px; - gap: 8px; - align-items: center; - .inputIcon { - color: var(--c--theme--colors--greyscale-400); - } -} - -.loading { - display: flex; - justify-content: center; - align-items: center; -} .c__modal__scroller:has(.quick-search-container), .c__modal__scroller:has(.noPadding) { diff --git a/src/frontend/apps/impress/src/components/separators/HorizontalSeparator.tsx b/src/frontend/apps/impress/src/components/separators/HorizontalSeparator.tsx index b660e2595..4b2a45489 100644 --- a/src/frontend/apps/impress/src/components/separators/HorizontalSeparator.tsx +++ b/src/frontend/apps/impress/src/components/separators/HorizontalSeparator.tsx @@ -24,7 +24,7 @@ export const HorizontalSeparator = ({ $background={ variant === SeparatorVariant.DARK ? '#e5e5e533' - : colorsTokens()['greyscale-100'] + : colorsTokens()['greyscale-200'] } /> ); diff --git a/src/frontend/apps/impress/src/features/docs/doc-management/components/share/DocShareAddMemberListItem.tsx b/src/frontend/apps/impress/src/features/docs/doc-management/components/share/DocShareAddMemberListItem.tsx index 25ceaef38..ae1a5739a 100644 --- a/src/frontend/apps/impress/src/features/docs/doc-management/components/share/DocShareAddMemberListItem.tsx +++ b/src/frontend/apps/impress/src/features/docs/doc-management/components/share/DocShareAddMemberListItem.tsx @@ -23,7 +23,7 @@ export const DocShareAddMemberListItem = ({ user, onRemoveUser }: Props) => { $justify="center" $align="center" $gap={spacing.xs} - $background={color['greyscale-200']} + $background={color['greyscale-250']} $padding={{ horizontal: spacing['2xs'], vertical: spacing['3xs'] }} $css={css` color: ${color['greyscale-1000']}; @@ -34,8 +34,8 @@ export const DocShareAddMemberListItem = ({ user, onRemoveUser }: Props) => { + + ); }; diff --git a/src/frontend/apps/impress/src/features/docs/doc-management/components/share/DocShareModalInviteUserByEmail.tsx b/src/frontend/apps/impress/src/features/docs/doc-management/components/share/DocShareModalInviteUserByEmail.tsx index 72d865202..632ac4a33 100644 --- a/src/frontend/apps/impress/src/features/docs/doc-management/components/share/DocShareModalInviteUserByEmail.tsx +++ b/src/frontend/apps/impress/src/features/docs/doc-management/components/share/DocShareModalInviteUserByEmail.tsx @@ -15,6 +15,7 @@ export const DocShareModalInviteUserRow = ({ user }: Props) => { user={user} right={ { + const hasFullName = user.full_name != null && user.full_name !== ''; const { spacingsTokens } = useCunninghamTheme(); const spacings = spacingsTokens(); - const hasFullName = user.full_name != null && user.full_name !== ''; return ( - - - - - - {hasFullName ? user.full_name : user.email} - - {hasFullName && ( - - {user.email} + + + + + {hasFullName ? user.full_name : user.email} - )} + {hasFullName && ( + + {user.email} + + )} + - - - {right && ( - - {right} - - )} - + } + /> ); };