@quadrats/common 0.4.4 → 0.5.3

package/toggle-mark/index.cjs.js

@@ -5,27 +5,33 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var core = require('@quadrats/core');
 
 function createToggleMarkCreator(defaults) {
-    return ({ type = defaults.type, parentType = defaults.parentType } = {}) => {
+    return ({ type = defaults.type, variant = defaults.variant } = {}) => {
         const isToggleMarkActive = (editor) => {
             const mark = core.getMark(editor, type);
-            return mark === true;
+            if (mark !== true)
+                return false;
+            const nowVariant = core.getMark(editor, `${type}Variant`) || '';
+            if (variant) {
+                return nowVariant === variant;
+            }
+            return !nowVariant;
         };
         const toggleMark = (editor) => {
             const isActive = isToggleMarkActive(editor);
             if (isActive) {
                 editor.removeMark(type);
+                if (variant) {
+                    editor.removeMark(`${type}Variant`);
+                }
             }
             else {
-                if (parentType) {
-                    core.marksGroupBy(editor, (_mark) => {
-                        if (_mark.match(parentType)) {
-                            editor.removeMark(_mark);
-                            return true;
-                        }
-                        return false;
-                    });
-                }
                 editor.addMark(type, true);
+                if (variant) {
+                    editor.addMark(`${type}Variant`, variant);
+                }
+                else {
+                    editor.removeMark(`${type}Variant`);
+                }
             }
         };
         return {

package/toggle-mark/typings.d.ts

@@ -1,5 +1,5 @@
 import { Editor, WithMarkType } from '@quadrats/core';
-export interface ToggleMark extends WithMarkType {
-    isToggleMarkActive(editor: Editor): boolean;
-    toggleMark(editor: Editor): void;
+export interface ToggleMark<T extends Editor = Editor> extends WithMarkType {
+    isToggleMarkActive(editor: T): boolean;
+    toggleMark(editor: T): void;
 }

package/underline/createUnderline.d.ts

@@ -1 +1 @@
-export declare const createUnderline: (variant?: string | undefined) => ({ type, parentType }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;
+export declare const createUnderline: (variant?: string | undefined) => ({ type, variant }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark<import("slate").BaseEditor>;

package/underline/createUnderline.js

@@ -1,10 +1,9 @@
 import { createToggleMarkCreator } from '@quadrats/common/toggle-mark';
-import { getVariantType } from '@quadrats/core';
 import { UNDERLINE_TYPE } from './constants.js';
 
 const createUnderline = (variant) => createToggleMarkCreator({
-    type: getVariantType(UNDERLINE_TYPE, variant),
-    parentType: UNDERLINE_TYPE,
+    type: UNDERLINE_TYPE,
+    variant,
 });
 
 export { createUnderline };

package/underline/index.cjs.js

@@ -3,13 +3,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var toggleMark = require('@quadrats/common/toggle-mark');
-var core = require('@quadrats/core');
 
 const UNDERLINE_TYPE = 'underline';
 
 const createUnderline = (variant) => toggleMark.createToggleMarkCreator({
-    type: core.getVariantType(UNDERLINE_TYPE, variant),
-    parentType: UNDERLINE_TYPE,
+    type: UNDERLINE_TYPE,
+    variant,
 });
 
 exports.UNDERLINE_TYPE = UNDERLINE_TYPE;