From 7f96e9504e02feb8acefde347c8c0ebcf80193cf Mon Sep 17 00:00:00 2001 From: Borja <158476064+borja-writefull@users.noreply.github.com> Date: Wed, 5 Nov 2025 17:13:58 +0100 Subject: [PATCH] Revert "Writefull refactor bootstrapping (#29306)" (#29542) This reverts commit 6de05eb695579dc08cb5ee6ddf30c243cc2ff86a. GitOrigin-RevId: 1fe00bd95b2ce437f91b38667e4d787d49c36902 --- services/web/config/settings.defaults.js | 2 -- .../ide-react/context/react-context-root.tsx | 24 ++----------------- .../components/codemirror-toolbar.tsx | 9 ------- .../context/types/writefull-instance.ts | 1 + 4 files changed, 3 insertions(+), 33 deletions(-) diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js index 4cb662aca0..5ad605fe54 100644 --- a/services/web/config/settings.defaults.js +++ b/services/web/config/settings.defaults.js @@ -996,8 +996,6 @@ module.exports = { sourceEditorCompletionSources: [], sourceEditorSymbolPalette: [], sourceEditorToolbarComponents: [], - sourceEditorToolbarEndButtons: [], - rootContextProviders: [], mainEditorLayoutModals: [], langFeedbackLinkingWidgets: [], labsExperiments: [], diff --git a/services/web/frontend/js/features/ide-react/context/react-context-root.tsx b/services/web/frontend/js/features/ide-react/context/react-context-root.tsx index 8e8f75c067..60041059e8 100644 --- a/services/web/frontend/js/features/ide-react/context/react-context-root.tsx +++ b/services/web/frontend/js/features/ide-react/context/react-context-root.tsx @@ -1,4 +1,4 @@ -import React, { ElementType, FC, PropsWithChildren } from 'react' +import React, { FC, PropsWithChildren } from 'react' import { ChatProvider } from '@/features/chat/context/chat-context' import { ConnectionProvider } from './connection-context' import { DetachCompileProvider } from '@/shared/context/detach-compile-context' @@ -30,12 +30,6 @@ import { UserFeaturesProvider } from '@/shared/context/user-features-context' import { UserSettingsProvider } from '@/shared/context/user-settings-context' import { IdeRedesignSwitcherProvider } from './ide-redesign-switcher-context' import { CommandRegistryProvider } from './command-registry-context' -import importOverleafModules from '../../../../macros/import-overleaf-module.macro' - -const rootContextProviders = importOverleafModules('rootContextProviders') as { - import: { default: ElementType } - path: string -}[] export const ReactContextRoot: FC< React.PropsWithChildren<{ @@ -77,18 +71,6 @@ export const ReactContextRoot: FC< ...providers, } - // Extract dynamic providers from modules - const dynamicProviders = rootContextProviders.map( - module => module.import.default - ) - - // Wrap children with all dynamic providers from outside to inside - const childrenWrappedWithDynamicProviders = - dynamicProviders.reduceRight( - (acc, Provider) => {acc}, - <>{children} - ) - return ( @@ -121,9 +103,7 @@ export const ReactContextRoot: FC< - { - childrenWrappedWithDynamicProviders - } + {children} diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx index 0b8b8caa31..a6265ecc93 100644 --- a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx +++ b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx @@ -40,10 +40,6 @@ const sourceEditorToolbarComponents = importOverleafModules( 'sourceEditorToolbarComponents' ) as { import: { default: ElementType }; path: string }[] -const sourceEditorToolbarEndButtons = importOverleafModules( - 'sourceEditorToolbarEndButtons' -) as { import: { default: ElementType }; path: string }[] - export const CodeMirrorToolbar = () => { const view = useCodeMirrorViewContext() const panel = getPanel(view, createToolbarPanel) @@ -208,11 +204,6 @@ const Toolbar = memo(function Toolbar() { className="ol-cm-toolbar-button-group ol-cm-toolbar-end" ref={handleButtons} > - {sourceEditorToolbarEndButtons.map( - ({ import: { default: Component }, path }) => ( - - ) - )} diff --git a/services/web/frontend/js/shared/context/types/writefull-instance.ts b/services/web/frontend/js/shared/context/types/writefull-instance.ts index 0fb871905e..01b65ffe3f 100644 --- a/services/web/frontend/js/shared/context/types/writefull-instance.ts +++ b/services/web/frontend/js/shared/context/types/writefull-instance.ts @@ -7,6 +7,7 @@ export interface WritefullEvents { } export interface WritefullAPI { + init(): void addEventListener( name: eventName, callback: (detail: WritefullEvents[eventName]) => void