@fastkit/vui 0.8.11 → 0.8.15

package/src/components/VWysiwygEditor/extensions/linter/Linter.tsx

@@ -20,7 +20,7 @@ function resolveWysiwygLinterFixMessage(message: WysiwygLinterFixMessage) {
   return typeof message === 'function' ? message() : message;
 }
 
-function renderIcon(view: EditorView<any>, issue: Issue) {
+function renderIcon(view: EditorView, issue: Issue) {
   const { level = 'warning' } = issue;
   const icon = document.createElement('div');
   const message = resolveWysiwygLinterFixMessage(issue.message);
@@ -81,7 +81,7 @@ export interface WysiwygLinterStorage {
 }
 
 export const WysiwygLinter = createWysiwygExtension((ctx) => {
-  function showMenu(view: EditorView<any>, issue: Issue, event: Event) {
+  function showMenu(view: EditorView, issue: Issue, event: Event) {
     const message = resolveWysiwygLinterFixMessage(issue.message);
     const variant = ctx.vui.setting('containedVariant');
     const scope = ctx.vui.setting(`${issue.level}Scope`);
@@ -166,49 +166,45 @@ export const WysiwygLinter = createWysiwygExtension((ctx) => {
         };
       };
 
-      return [
-        new Plugin({
-          key: new PluginKey('linter'),
-          state: {
-            init(_, { doc }) {
-              return runAll(doc);
-            },
-            apply(transaction, oldState) {
-              return transaction.docChanged
-                ? runAll(transaction.doc)
-                : oldState;
-            },
+      const linterPlugin: Plugin<any> = new Plugin({
+        key: new PluginKey('linter'),
+        state: {
+          init(_, { doc }) {
+            return runAll(doc);
           },
-          props: {
-            decorations(state) {
-              return this.getState(state);
-            },
-            handleClick(view, _, event) {
-              const info = getIssueElementByEvent(event.target);
-              if (!info) {
-                return false;
-              }
-
-              const { issue } = info;
-              const { from, to } = issue;
-
-              const focus = () =>
-                view.dispatch(
-                  view.state.tr
-                    .setSelection(
-                      TextSelection.create(view.state.doc, from, to),
-                    )
-                    .scrollIntoView(),
-                );
-
-              focus();
-
-              showMenu(view, issue, event);
-              return true;
-            },
+          apply(transaction, oldState) {
+            return transaction.docChanged ? runAll(transaction.doc) : oldState;
           },
-        }),
-      ];
+        },
+        props: {
+          decorations(state) {
+            return linterPlugin.getState(state);
+          },
+          handleClick(view, _, event) {
+            const info = getIssueElementByEvent(event.target);
+            if (!info) {
+              return false;
+            }
+
+            const { issue } = info;
+            const { from, to } = issue;
+
+            const focus = () =>
+              view.dispatch(
+                view.state.tr
+                  .setSelection(TextSelection.create(view.state.doc, from, to))
+                  .scrollIntoView(),
+              );
+
+            focus();
+
+            showMenu(view, issue, event);
+            return true;
+          },
+        },
+      });
+
+      return [linterPlugin];
     },
   });
 });

package/src/styles/core/typo.scss

@@ -1,3 +1,7 @@
+@function get-typo-family($level) {
+  @return var(--typo-#{$level}-family);
+}
+
 @function get-typo-size($level) {
   @return var(--typo-#{$level}-size);
 }
@@ -22,6 +26,10 @@
   @return var(--typo-#{$level}-color);
 }
 
+@mixin typo-family($level) {
+  font-family: get-typo-family($level);
+}
+
 @mixin typo-size($level) {
   font-size: get-typo-size($level);
 }
@@ -47,6 +55,7 @@
 }
 
 @mixin typo($level) {
+  @include typo-family($level);
   @include typo-size($level);
   @include typo-weight($level);
   @include typo-height($level);

package/src/styles/variables.scss

@@ -34,6 +34,7 @@
   --typo-medium-weight: 500;
 
   // h1
+  --typo-h1-family: inherit;
   --typo-h1-size: 2.5rem;
   --typo-h1-weight: 500;
   --typo-h1-height: 1.2222222222222223;
@@ -42,6 +43,7 @@
   --typo-h1-color: var(--palette-heading);
 
   // h2
+  --typo-h2-family: inherit;
   --typo-h2-size: 1.875rem;
   --typo-h2-weight: 500;
   --typo-h2-height: 1.5;
@@ -50,6 +52,7 @@
   --typo-h2-color: var(--palette-heading);
 
   // h3
+  --typo-h3-family: inherit;
   --typo-h3-size: 1.25rem;
   --typo-h3-weight: 500;
   --typo-h3-height: 1.5;
@@ -58,6 +61,7 @@
   --typo-h3-color: var(--palette-heading);
 
   // h4
+  --typo-h4-family: inherit;
   --typo-h4-size: 1.25rem;
   --typo-h4-weight: 400;
   --typo-h4-height: 1.5;
@@ -66,6 +70,7 @@
   --typo-h4-color: var(--palette-heading);
 
   // h5
+  --typo-h5-family: inherit;
   --typo-h5-size: 0.875rem;
   --typo-h5-weight: 400;
   --typo-h5-height: 1.57;
@@ -74,6 +79,7 @@
   --typo-h5-color: var(--palette-heading);
 
   // h6
+  --typo-h6-family: inherit;
   --typo-h6-size: 0.67rem;
   --typo-h6-weight: 400;
   --typo-h6-height: 1.5;
@@ -82,12 +88,14 @@
   --typo-h6-color: var(--palette-heading);
 
   // subtitle1
+  --typo-subtitle1-family: inherit;
   --typo-subtitle1-size: 1rem;
   --typo-subtitle1-weight: 400;
   --typo-subtitle1-height: 1.75;
   --typo-subtitle1-spacing: 0.00938em;
 
   // subtitle2
+  --typo-subtitle2-family: inherit;
   --typo-subtitle2-size: 0.875rem;
   --typo-subtitle2-weight: 500;
   --typo-subtitle2-height: 1.57;

package/src/tool/vite-plugin.ts

@@ -75,28 +75,15 @@ async function renderTemplate({
 }
 
 function defaultDynamicDest() {
-  // const pkgDir = findPackageDirSync();
-  // if (!pkgDir) {
-  //   throw new Error(`missing package directory`);
-  // }
-  // return path.join(pkgDir, '.vui');
   return path.resolve('.vui');
 }
 
 function getBuiltinsDir() {
-  // const cwd = process.cwd();
   const pkgDir = findPackageDirSync(undefined, true);
   if (!pkgDir) {
     throw new Error(`missing package directory`);
   }
 
-  // For development...
-  // console.log('■■■', cwd);
-  // if (cwd.endsWith('/docs')) {
-  //   const result = path.resolve(cwd, '../packages/vui/src/assets/builtins');
-  //   return result;
-  // }
-
   return path.join(pkgDir, 'node_modules/@fastkit/vui/dist/assets/builtins');
 }
 
@@ -112,7 +99,6 @@ export interface ViteVuiPluginOptions
   __dev?: boolean;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ViteVuiPluginResultSettings
   extends Pick<VuiServiceOptions, 'uiSettings' | 'icons'> {
   colorScheme: string;
@@ -191,11 +177,6 @@ export function viteVuiPlugin(
   const { dynamicDest: _dynamicDest } = options;
 
   if (!_dynamicDest) {
-    // if (options.__dev) {
-    //   dynamicDest = path.resolve(__dirname, '../../../../docs/.vui');
-    // } else {
-    //   dynamicDest = defaultDynamicDest();
-    // }
     dynamicDest = defaultDynamicDest();
   } else {
     dynamicDest = _dynamicDest;
@@ -261,7 +242,6 @@ export {};
       const ssr = (config as any).ssr || {};
       ssr.noExternal = ssr.noExternal || [];
       ssr.noExternal.push(/\/vui\/dist\/assets\//);
-      // ssr.noExternal.push(/\/fastkit\//);
 
       (config as any).ssr = ssr;
       return config;