remove formik from insert-cite (and deps)

quarto-dev · Jun 11, 2023 · 3a2255a · 3a2255a
1 parent c38cdef
commit 3a2255a
Show file tree

Hide file tree

Showing 23 changed files with 203 additions and 892 deletions.
diff --git a/apps/writer-server/package.json b/apps/writer-server/package.json
@@ -25,7 +25,7 @@
     "@types/cors": "^2.8.10",
     "@types/express": "^4.17.12",
     "@types/morgan": "^1.9.2",
-    "@types/node": "^15.12.2",
+    "@types/node": "^16.11.20",
     "@types/tmp": "^0.2.3",
     "editor-server": "*",
     "editor-types": "*",

diff --git a/apps/writer-server/tsconfig.json b/apps/writer-server/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "lib": ["ES2015"],
+    "lib": ["ES2020"],
     "module": "CommonJS",
     "outDir": "./dist",
     "rootDir": "./src"

diff --git a/apps/writer/package.json b/apps/writer/package.json
@@ -22,7 +22,6 @@
     "editor-core": "*",
     "editor-types": "*",
     "editor-ui": "*",
-    "formik": "^2.2.9",
     "i18next": "^22.0.4",
     "jayson": "^4.0.0",
     "lodash.debounce": "^4.0.8",
@@ -32,8 +31,7 @@
     "react-transition-group": "^4.4.5",
     "redux": "^4.2.0",
     "ui-widgets": "*",
-    "uuid": "^9.0.0",
-    "yup": "^0.32.11"
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@types/lodash.debounce": "^4.0.7",

diff --git a/apps/writer/src/workbench/WorkbenchPrefsDialog.tsx b/apps/writer/src/workbench/WorkbenchPrefsDialog.tsx
@@ -15,8 +15,6 @@
 
 import React, { useContext, useEffect, useState } from 'react';
 
-import { FormikDialog, FormikHTMLSelect } from 'ui-widgets';
-
 import { 
   CommandManagerContext, 
   useGetPrefsQuery, 
@@ -29,6 +27,8 @@ import {
 import { defaultPrefs, Prefs } from 'editor-types';
 
 import { WorkbenchCommandId } from './commands';
+import { ModalDialog } from 'ui-widgets';
+import { Field, Select } from '@fluentui/react-components';
 
 export const WorkbenchPrefsDialog: React.FC = () => {
   // command to show dialog
@@ -55,6 +55,8 @@ export const WorkbenchPrefsDialog: React.FC = () => {
   const { data: prefs = defaultPrefs() } = useGetPrefsQuery();
   const [ setPrefs ] = useSetPrefsMutation();
   const { data: dictionaries } = useGetAvailableDictionariesQuery();
+
+  const [dictionaryLocale, setDictionaryLocale] = useState(prefs.dictionaryLocale);
 
   const close = (prefs?: Prefs) => {
     setIsOpen(false);
@@ -65,25 +67,27 @@ export const WorkbenchPrefsDialog: React.FC = () => {
   }
 
   return (
-    <FormikDialog
+    <ModalDialog
       isOpen={isOpen}
       title={t('prefs_dialog_caption') as string}
-      initialValues={prefs}
-      onSubmit={close}
-      onReset={() => close()}
+      onOK={() => close({ ...prefs, dictionaryLocale })}
+      onCancel={() => close()}
     >
-      <FormikHTMLSelect 
-        name={'dictionaryLocale'} 
-        label={t('prefs_dialog_dictionary_locale')} 
-        options={dictionaries 
-          ? dictionaries.map(dictionary => ({
-              value: dictionary.locale,
-              label: dictionary.name
-            }))
-          : [ { value: prefs.dictionaryLocale } ]
-        } 
-      />
-    </FormikDialog>
+      <Field label={t('prefs_dialog_dictionary_locale')} >
+        <Select
+          value={dictionaryLocale}
+          onChange={(_ev, data) => setDictionaryLocale(data.value)}
+        >
+          {dictionaries
+            ? dictionaries.map(dictionary => {
+              return <option value={dictionary.locale} key={dictionary.locale}>{dictionary.name}</option>
+            })
+            : <option value={dictionaryLocale}>{dictionaryLocale}</option>
+
+          }
+        </Select>
+      </Field>
+    </ModalDialog>
   );
 };
 

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
@@ -8,27 +8,23 @@
   "dependencies": {
     "@fluentui/react-components": "^9.21.0",
     "@fluentui/react-icons": "^2.0.203",
-    "@types/yup": "^0.32.0",
     "core": "*",
     "core-browser": "*",
     "editor-core": "*",
     "editor-types": "*",
-    "formik": "^2.2.9",
     "i18next": "^22.4.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-transition-group": "^4.4.5",
     "redux": "^4.2.0",
     "typo-js": "^1.2.2",
     "ui-widgets": "*",
-    "use-debounce": "^9.0.2",
-    "yup": "^0.32.11"
+    "use-debounce": "^9.0.2"
   },
   "devDependencies": {
     "@types/react": "^18.2.6",
     "@types/react-dom": "^18.2.4",
     "@types/typo-js": "^1.2.0",
-    "@types/yup": "^0.32.0",
     "tsconfig": "*",
     "typescript": "^4.5.2"
   }