Merge pull request #34512 from overleaf/mj-floating-toolbar-option

[web] Add setting for floating toolbar menu

GitOrigin-RevId: bd28f1f287f2011535c7fd530f1217f01e0cfbbc
This commit is contained in:
Mathias Jakobsen
2026-06-18 08:07:33 +00:00
committed by Copybot
parent 106dd1b07b
commit 5f79c2dd10
17 changed files with 237 additions and 5 deletions
@@ -28,6 +28,7 @@ import { useFeatureFlag } from '@/shared/context/split-test-context'
import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
import UpgradeTrackChangesModal from '@/features/review-panel/components/upgrade-track-changes-modal'
import { useUserSettingsContext } from '@/shared/context/user-settings-context'
// TODO: remove this when definitely no longer used
export * from './codemirror-context'
@@ -95,6 +96,9 @@ function CodeMirrorEditorComponents({
}: CodeMirrorEditorComponentsProps) {
useToolbarMenuBarEditorCommands()
const { features } = useProjectContext()
const {
userSettings: { floatingMenu },
} = useUserSettingsContext()
const writefullToolbarMigrationEnabled = useFeatureFlag(
'writefull-toolbar-migration'
)
@@ -109,7 +113,8 @@ function CodeMirrorEditorComponents({
<MathPreviewTooltip />
<EditorContextMenu />
{features.trackChangesVisible &&
{floatingMenu &&
features.trackChangesVisible &&
(writefullToolbarMigrationEnabled ? (
<>
<AddCommentCommand />