diff --git a/services/web/frontend/js/features/share-project-modal/components/project-access.tsx b/services/web/frontend/js/features/share-project-modal/components/project-access.tsx
index ba210e1c60..15bb24ea66 100644
--- a/services/web/frontend/js/features/share-project-modal/components/project-access.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/project-access.tsx
@@ -5,12 +5,12 @@ import MaterialIcon from '@/shared/components/material-icon'
import OLButton from '@/shared/components/ol/ol-button'
import DropdownMenuItem from '@/shared/components/dropdown/dropdown-menu-item'
import {
- Dropdown,
- DropdownDivider,
- DropdownItem,
- DropdownMenu,
- DropdownToggle,
-} from '@/shared/components/dropdown/dropdown-menu'
+ OLDropdown,
+ OLDropdownDivider,
+ OLDropdownItem,
+ OLDropdownMenu,
+ OLDropdownToggle,
+} from '@/shared/components/ol/ol-dropdown-menu'
import DropdownListItem from '@/shared/components/dropdown/dropdown-list-item'
import LinkSharing from '@/features/share-project-modal/components/link-sharing'
import { useEditorContext } from '@/shared/context/editor-context'
@@ -214,19 +214,19 @@ function ProjectAccess({
{projectAccess === 'anyoneWithTheLink' && (
)}
-
-
+
{getProjectAccessDropdownToggleText()}
-
-
+
+
{projectAccess === 'legacyLinkSharing' && (
<>
- }
@@ -238,13 +238,13 @@ function ProjectAccess({
active={projectAccess === 'legacyLinkSharing'}
>
{t('via_sharing_links_legacy')}
-
+
-
+
)}
- }
@@ -256,7 +256,7 @@ function ProjectAccess({
active={projectAccess === 'onlyInvitedPeople'}
>
{t('only_invited_people')}
-
+
{groupSharingEnabled &&
activeProfessionalGroupSubscriptions &&
@@ -265,7 +265,7 @@ function ProjectAccess({
className="d-flex align-items-center"
key={subscription._id}
>
- }
@@ -283,11 +283,11 @@ function ProjectAccess({
{t('anyone_in_x_with_the_link', {
groupName: subscription.teamName || 'your group',
})}
-
+
))}
- }
@@ -299,10 +299,10 @@ function ProjectAccess({
active={projectAccess === 'anyoneWithTheLink'}
>
{t('anyone_with_the_link')}
-
+
-
-
+
+
{pendingAccess && (
{projectAccess !== 'legacyLinkSharing' && privileges && (
-
-
+
-
-
+
+
{t('viewer')}
-
-
+
+
)}
)}
diff --git a/services/web/frontend/js/features/share-project-modal/components/select-collaborators.tsx b/services/web/frontend/js/features/share-project-modal/components/select-collaborators.tsx
index 7bdb1465fd..b5f797382e 100644
--- a/services/web/frontend/js/features/share-project-modal/components/select-collaborators.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/select-collaborators.tsx
@@ -5,7 +5,7 @@ import { useCombobox, UseMultipleSelectionReturnValue } from 'downshift'
import classnames from 'classnames'
import MaterialIcon from '@/shared/components/material-icon'
-import { DropdownItem } from '@/shared/components/dropdown/dropdown-menu'
+import { OLDropdownItem } from '@/shared/components/ol/ol-dropdown-menu'
import { Contact } from '../utils/types'
import OLFormLabel from '@/shared/components/ol/ol-form-label'
import OLSpinner from '@/shared/components/ol/ol-spinner'
@@ -446,7 +446,7 @@ function Option({
const isSharingUpdatesEnabled = useFeatureFlag('sharing-updates')
return (
-
{item.display}
-
+
)
}
diff --git a/services/web/frontend/js/features/source-editor/components/editor-context-menu-feedback.tsx b/services/web/frontend/js/features/source-editor/components/editor-context-menu-feedback.tsx
index d65eabefa9..51473d242f 100644
--- a/services/web/frontend/js/features/source-editor/components/editor-context-menu-feedback.tsx
+++ b/services/web/frontend/js/features/source-editor/components/editor-context-menu-feedback.tsx
@@ -1,9 +1,9 @@
import { FC, memo } from 'react'
import { useTranslation } from 'react-i18next'
import {
- DropdownItem,
- DropdownDivider,
-} from '@/shared/components/dropdown/dropdown-menu'
+ OLDropdownItem,
+ OLDropdownDivider,
+} from '@/shared/components/ol/ol-dropdown-menu'
import DropdownListItem from '@/shared/components/dropdown/dropdown-list-item'
import SplitTestBadge from '@/shared/components/split-test-badge'
import { sendContextMenuEvent } from '../utils/context-menu-analytics'
@@ -24,9 +24,9 @@ export const EditorContextMenuFeedback: FC = memo(
return (
<>
-
+
-
{t('give_feedback')}
-
+
)
diff --git a/services/web/frontend/js/features/source-editor/components/editor-context-menu.tsx b/services/web/frontend/js/features/source-editor/components/editor-context-menu.tsx
index ce6b5e3f4c..7e3783771e 100644
--- a/services/web/frontend/js/features/source-editor/components/editor-context-menu.tsx
+++ b/services/web/frontend/js/features/source-editor/components/editor-context-menu.tsx
@@ -2,11 +2,11 @@ import { FC, Fragment, memo, useEffect, useRef } from 'react'
import ReactDOM from 'react-dom'
import { getTooltip } from '@codemirror/view'
import {
- Dropdown,
- DropdownMenu,
- DropdownItem,
- DropdownDivider,
-} from '@/shared/components/dropdown/dropdown-menu'
+ OLDropdown,
+ OLDropdownMenu,
+ OLDropdownItem,
+ OLDropdownDivider,
+} from '@/shared/components/ol/ol-dropdown-menu'
import {
useCodeMirrorStateContext,
useCodeMirrorViewContext,
@@ -48,9 +48,9 @@ const EditorContextMenuContent: FC = memo(function EditorContextMenuContent() {
}, [])
return (
-
+
event.preventDefault()}>
-
{menuItems.map((menuItem, index) => (
- {menuItem.separatorAbove && }
+ {menuItem.separatorAbove && }
- menuItem.handler()}
disabled={menuItem.disabled}
@@ -80,14 +80,14 @@ const EditorContextMenuContent: FC = memo(function EditorContextMenuContent() {
}
>
{menuItem.label}
-
+
))}
-
+
,
document.body
)
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/math-dropdown.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/math-dropdown.tsx
index 3c07f5166d..df408a5004 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/math-dropdown.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/math-dropdown.tsx
@@ -1,4 +1,4 @@
-import { DropdownHeader } from '@/shared/components/dropdown/dropdown-menu'
+import { OLDropdownHeader } from '@/shared/components/ol/ol-dropdown-menu'
import { ToolbarButtonMenu } from './button-menu'
import { emitToolbarEvent } from '../../extensions/toolbar/utils/analytics'
import MaterialIcon from '../../../../shared/components/material-icon'
@@ -31,9 +31,9 @@ export const MathDropdown = memo(function MathDropdown() {
>
{renderAIButton && (
<>
-
+
{t('toolbar_insert_math_lowercase')}
-
+
}
>
-
+
{t('toolbar_table_insert_table_lowercase')}
-
+
-
{language.name}
-
+
)
diff --git a/services/web/frontend/js/features/source-editor/extensions/spelling/spelling-suggestions.tsx b/services/web/frontend/js/features/source-editor/extensions/spelling/spelling-suggestions.tsx
index eaba8b768f..6c6060ae00 100644
--- a/services/web/frontend/js/features/source-editor/extensions/spelling/spelling-suggestions.tsx
+++ b/services/web/frontend/js/features/source-editor/extensions/spelling/spelling-suggestions.tsx
@@ -16,11 +16,11 @@ import { captureException } from '@/infrastructure/error-reporter'
import { debugConsole } from '@/utils/debugging'
import { SpellCheckLanguage } from '../../../../../../types/project-settings'
import {
- Dropdown,
- DropdownDivider,
- DropdownItem,
- DropdownMenu,
-} from '@/shared/components/dropdown/dropdown-menu'
+ OLDropdown,
+ OLDropdownDivider,
+ OLDropdownItem,
+ OLDropdownMenu,
+} from '@/shared/components/ol/ol-dropdown-menu'
import DropdownListItem from '@/shared/components/dropdown/dropdown-list-item'
const ITEMS_TO_SHOW = 8
@@ -124,8 +124,8 @@ const B5SpellingSuggestions: FC = ({
}, [waiting])
return (
-
-
+ = ({
}}
/>
))}
- {suggestions?.length > 0 && }
+ {suggestions?.length > 0 && }
{
@@ -162,13 +162,13 @@ const B5SpellingSuggestions: FC = ({
}}
/>
-
+
-
-
+
+
)
}
@@ -177,6 +177,6 @@ const SpellingListItem: FC<{
handleClick: MouseEventHandler
}> = ({ content, handleClick }) => (
- {content}
+ {content}
)
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/add-ons.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/add-ons.tsx
index 04013ee7b4..4e9be6bc04 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/add-ons.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/add-ons.tsx
@@ -1,7 +1,11 @@
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import getMeta from '@/utils/meta'
-import { Dropdown, DropdownMenu, DropdownToggle } from 'react-bootstrap'
+import {
+ OLDropdown,
+ OLDropdownMenu,
+ OLDropdownToggle,
+} from '@/shared/components/ol/ol-dropdown-menu'
import { postJSON } from '@/infrastructure/fetch-json'
import { debugConsole } from '@/utils/debugging'
import DropdownMenuItem from '@/shared/components/dropdown/dropdown-menu-item'
@@ -106,8 +110,8 @@ function AddOn({
{reactivateState !== 'reactivating' && (