Преглед изворни кода

Remove multiple source of type imports; add `type` on type imports.

GitOrigin-RevId: a6630bb284c456bfbe61901f7331cdd3c13c7f8b
M Fahru пре 3 година
родитељ
комит
e3d0380e6f

+ 3 - 4
services/web/frontend/js/features/editor-left-menu/hooks/use-project-wide-settings-socket-listener.tsx

@@ -1,5 +1,4 @@
 import { useCallback, useEffect } from 'react'
 import { useCallback, useEffect } from 'react'
-import { ProjectCompiler } from '../../../../../types/project-settings'
 import { useIdeContext } from '../../../shared/context/ide-context'
 import { useIdeContext } from '../../../shared/context/ide-context'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
 import type { ProjectSettingsScope } from '../utils/api'
 import type { ProjectSettingsScope } from '../utils/api'
@@ -12,7 +11,7 @@ export default function useProjectWideSettingsSocketListener() {
   >('project', true)
   >('project', true)
 
 
   const setCompiler = useCallback(
   const setCompiler = useCallback(
-    (compiler: ProjectCompiler) => {
+    (compiler: ProjectSettingsScope['compiler']) => {
       if (projectScope) {
       if (projectScope) {
         setProjectScope({ ...projectScope, compiler })
         setProjectScope({ ...projectScope, compiler })
       }
       }
@@ -21,7 +20,7 @@ export default function useProjectWideSettingsSocketListener() {
   )
   )
 
 
   const setImageName = useCallback(
   const setImageName = useCallback(
-    (imageName: string) => {
+    (imageName: ProjectSettingsScope['imageName']) => {
       if (projectScope) {
       if (projectScope) {
         setProjectScope({ ...projectScope, imageName })
         setProjectScope({ ...projectScope, imageName })
       }
       }
@@ -30,7 +29,7 @@ export default function useProjectWideSettingsSocketListener() {
   )
   )
 
 
   const setSpellCheckLanguage = useCallback(
   const setSpellCheckLanguage = useCallback(
-    (spellCheckLanguage: string) => {
+    (spellCheckLanguage: ProjectSettingsScope['spellCheckLanguage']) => {
       if (projectScope) {
       if (projectScope) {
         setProjectScope({ ...projectScope, spellCheckLanguage })
         setProjectScope({ ...projectScope, spellCheckLanguage })
       }
       }

+ 3 - 4
services/web/frontend/js/features/editor-left-menu/hooks/use-project-wide-settings.tsx

@@ -1,8 +1,7 @@
 import { useCallback } from 'react'
 import { useCallback } from 'react'
-import { ProjectCompiler } from '../../../../../types/project-settings'
 import { useProjectContext } from '../../../shared/context/project-context'
 import { useProjectContext } from '../../../shared/context/project-context'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
-import { ProjectSettingsScope, saveProjectSettings } from '../utils/api'
+import { type ProjectSettingsScope, saveProjectSettings } from '../utils/api'
 import useSetRootDocId from './use-set-root-doc-id'
 import useSetRootDocId from './use-set-root-doc-id'
 import useSetSpellCheckLanguage from './use-set-spell-check-language'
 import useSetSpellCheckLanguage from './use-set-spell-check-language'
 
 
@@ -15,7 +14,7 @@ export default function useProjectWideSettings() {
   const { _id: projectId } = useProjectContext()
   const { _id: projectId } = useProjectContext()
 
 
   const setCompiler = useCallback(
   const setCompiler = useCallback(
-    (compiler: ProjectCompiler) => {
+    (compiler: ProjectSettingsScope['compiler']) => {
       const allowUpdate = project?.compiler
       const allowUpdate = project?.compiler
 
 
       if (allowUpdate) {
       if (allowUpdate) {
@@ -27,7 +26,7 @@ export default function useProjectWideSettings() {
   )
   )
 
 
   const setImageName = useCallback(
   const setImageName = useCallback(
-    (imageName: string) => {
+    (imageName: ProjectSettingsScope['imageName']) => {
       const allowUpdate = project?.imageName
       const allowUpdate = project?.imageName
 
 
       if (allowUpdate) {
       if (allowUpdate) {

+ 6 - 7
services/web/frontend/js/features/editor-left-menu/hooks/use-set-overall-theme.tsx

@@ -1,18 +1,17 @@
 import { useCallback, useEffect, useState } from 'react'
 import { useCallback, useEffect, useState } from 'react'
 import _ from 'lodash'
 import _ from 'lodash'
-import { OverallTheme } from '../../../../../modules/source-editor/frontend/js/extensions/theme'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
-import { OverallThemeMeta } from '../../../../../types/project-settings'
-import { saveUserSettings } from '../utils/api'
+import type { OverallThemeMeta } from '../../../../../types/project-settings'
+import { saveUserSettings, type UserSettingsScope } from '../utils/api'
 
 
 export default function useSetOverallTheme() {
 export default function useSetOverallTheme() {
   const [chosenTheme, setChosenTheme] = useState<OverallThemeMeta | null>(null)
   const [chosenTheme, setChosenTheme] = useState<OverallThemeMeta | null>(null)
   const [loadingStyleSheet, setLoadingStyleSheet] = useScopeValue<boolean>(
   const [loadingStyleSheet, setLoadingStyleSheet] = useScopeValue<boolean>(
     'ui.loadingStyleSheet'
     'ui.loadingStyleSheet'
   )
   )
-  const [overallThemeScope, setOverallThemeScope] = useScopeValue<OverallTheme>(
-    'settings.overallTheme'
-  )
+  const [overallThemeScope, setOverallThemeScope] = useScopeValue<
+    UserSettingsScope['overallTheme']
+  >('settings.overallTheme')
 
 
   useEffect(() => {
   useEffect(() => {
     const docHeadEl = document.querySelector('head')
     const docHeadEl = document.querySelector('head')
@@ -45,7 +44,7 @@ export default function useSetOverallTheme() {
   }, [loadingStyleSheet, setLoadingStyleSheet, chosenTheme?.path])
   }, [loadingStyleSheet, setLoadingStyleSheet, chosenTheme?.path])
 
 
   const setOverallTheme = useCallback(
   const setOverallTheme = useCallback(
-    (overallTheme: OverallTheme) => {
+    (overallTheme: UserSettingsScope['overallTheme']) => {
       if (overallThemeScope !== overallTheme) {
       if (overallThemeScope !== overallTheme) {
         const chosenTheme = _.find(
         const chosenTheme = _.find(
           window.overallThemes,
           window.overallThemes,

+ 3 - 3
services/web/frontend/js/features/editor-left-menu/hooks/use-set-root-doc-id.tsx

@@ -2,16 +2,16 @@ import { useCallback } from 'react'
 import { useEditorContext } from '../../../shared/context/editor-context'
 import { useEditorContext } from '../../../shared/context/editor-context'
 import { useProjectContext } from '../../../shared/context/project-context'
 import { useProjectContext } from '../../../shared/context/project-context'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
-import { saveProjectSettings } from '../utils/api'
+import { type ProjectSettingsScope, saveProjectSettings } from '../utils/api'
 
 
 export default function useSetRootDocId() {
 export default function useSetRootDocId() {
   const [rootDocIdScope, setRootDocIdScope] =
   const [rootDocIdScope, setRootDocIdScope] =
-    useScopeValue<string>('project.rootDoc_id')
+    useScopeValue<ProjectSettingsScope['rootDoc_id']>('project.rootDoc_id')
   const { permissionsLevel } = useEditorContext()
   const { permissionsLevel } = useEditorContext()
   const { _id: projectId } = useProjectContext()
   const { _id: projectId } = useProjectContext()
 
 
   const setRootDocId = useCallback(
   const setRootDocId = useCallback(
-    async (rootDocId: string) => {
+    async (rootDocId: ProjectSettingsScope['rootDoc_id']) => {
       const allowUpdate =
       const allowUpdate =
         typeof rootDocIdScope !== 'undefined' &&
         typeof rootDocIdScope !== 'undefined' &&
         permissionsLevel !== 'readOnly' &&
         permissionsLevel !== 'readOnly' &&

+ 9 - 4
services/web/frontend/js/features/editor-left-menu/hooks/use-set-spell-check-language.tsx

@@ -2,15 +2,20 @@ import { useCallback } from 'react'
 import { sendMB } from '../../../infrastructure/event-tracking'
 import { sendMB } from '../../../infrastructure/event-tracking'
 import { useProjectContext } from '../../../shared/context/project-context'
 import { useProjectContext } from '../../../shared/context/project-context'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
-import { saveProjectSettings, saveUserSettings } from '../utils/api'
+import {
+  type ProjectSettingsScope,
+  saveProjectSettings,
+  saveUserSettings,
+} from '../utils/api'
 
 
 export default function useSetSpellCheckLanguage() {
 export default function useSetSpellCheckLanguage() {
-  const [spellCheckLanguageScope, setSpellCheckLanguageScope] =
-    useScopeValue<string>('project.spellCheckLanguage')
+  const [spellCheckLanguageScope, setSpellCheckLanguageScope] = useScopeValue<
+    ProjectSettingsScope['spellCheckLanguage']
+  >('project.spellCheckLanguage')
   const { _id: projectId } = useProjectContext()
   const { _id: projectId } = useProjectContext()
 
 
   const setSpellCheckLanguage = useCallback(
   const setSpellCheckLanguage = useCallback(
-    (spellCheckLanguage: string) => {
+    (spellCheckLanguage: ProjectSettingsScope['spellCheckLanguage']) => {
       const allowUpdate =
       const allowUpdate =
         spellCheckLanguage && spellCheckLanguage !== spellCheckLanguageScope
         spellCheckLanguage && spellCheckLanguage !== spellCheckLanguageScope
 
 

+ 9 - 14
services/web/frontend/js/features/editor-left-menu/hooks/use-user-wide-settings.tsx

@@ -1,9 +1,4 @@
 import { useCallback } from 'react'
 import { useCallback } from 'react'
-import {
-  FontFamily,
-  LineHeight,
-} from '../../../../../modules/source-editor/frontend/js/extensions/theme'
-import { Keybindings, PdfViewer } from '../../../../../types/project-settings'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
 import useSetOverallTheme from './use-set-overall-theme'
 import useSetOverallTheme from './use-set-overall-theme'
 import useSaveUserSettings from './use-save-user-settings'
 import useSaveUserSettings from './use-save-user-settings'
@@ -20,63 +15,63 @@ export default function useUserWideSettings() {
 
 
   const setOverallTheme = useSetOverallTheme()
   const setOverallTheme = useSetOverallTheme()
   const setAutoComplete = useCallback(
   const setAutoComplete = useCallback(
-    (autoComplete: boolean) => {
+    (autoComplete: UserSettingsScope['autoComplete']) => {
       saveUserSettings('autoComplete', autoComplete)
       saveUserSettings('autoComplete', autoComplete)
     },
     },
     [saveUserSettings]
     [saveUserSettings]
   )
   )
 
 
   const setAutoPairDelimiters = useCallback(
   const setAutoPairDelimiters = useCallback(
-    (autoPairDelimiters: boolean) => {
+    (autoPairDelimiters: UserSettingsScope['autoPairDelimiters']) => {
       saveUserSettings('autoPairDelimiters', autoPairDelimiters)
       saveUserSettings('autoPairDelimiters', autoPairDelimiters)
     },
     },
     [saveUserSettings]
     [saveUserSettings]
   )
   )
 
 
   const setSyntaxValidation = useCallback(
   const setSyntaxValidation = useCallback(
-    (syntaxValidation: boolean) => {
+    (syntaxValidation: UserSettingsScope['syntaxValidation']) => {
       saveUserSettings('syntaxValidation', syntaxValidation)
       saveUserSettings('syntaxValidation', syntaxValidation)
     },
     },
     [saveUserSettings]
     [saveUserSettings]
   )
   )
 
 
   const setEditorTheme = useCallback(
   const setEditorTheme = useCallback(
-    (editorTheme: string) => {
+    (editorTheme: UserSettingsScope['editorTheme']) => {
       saveUserSettings('editorTheme', editorTheme)
       saveUserSettings('editorTheme', editorTheme)
     },
     },
     [saveUserSettings]
     [saveUserSettings]
   )
   )
 
 
   const setMode = useCallback(
   const setMode = useCallback(
-    (mode: Keybindings) => {
+    (mode: UserSettingsScope['mode']) => {
       saveUserSettings('mode', mode)
       saveUserSettings('mode', mode)
     },
     },
     [saveUserSettings]
     [saveUserSettings]
   )
   )
 
 
   const setFontSize = useCallback(
   const setFontSize = useCallback(
-    (fontSize: string) => {
+    (fontSize: UserSettingsScope['fontSize']) => {
       saveUserSettings('fontSize', fontSize)
       saveUserSettings('fontSize', fontSize)
     },
     },
     [saveUserSettings]
     [saveUserSettings]
   )
   )
 
 
   const setFontFamily = useCallback(
   const setFontFamily = useCallback(
-    (fontFamily: FontFamily) => {
+    (fontFamily: UserSettingsScope['fontFamily']) => {
       saveUserSettings('fontFamily', fontFamily)
       saveUserSettings('fontFamily', fontFamily)
     },
     },
     [saveUserSettings]
     [saveUserSettings]
   )
   )
 
 
   const setLineHeight = useCallback(
   const setLineHeight = useCallback(
-    (lineHeight: LineHeight) => {
+    (lineHeight: UserSettingsScope['lineHeight']) => {
       saveUserSettings('lineHeight', lineHeight)
       saveUserSettings('lineHeight', lineHeight)
     },
     },
     [saveUserSettings]
     [saveUserSettings]
   )
   )
 
 
   const setPdfViewer = useCallback(
   const setPdfViewer = useCallback(
-    (pdfViewer: PdfViewer) => {
+    (pdfViewer: UserSettingsScope['pdfViewer']) => {
       saveUserSettings('pdfViewer', pdfViewer)
       saveUserSettings('pdfViewer', pdfViewer)
     },
     },
     [saveUserSettings]
     [saveUserSettings]