npm - @zipify/wysiwyg - Versions diffs - 2.0.0-7 → 2.0.0-9 - Mend

@zipify/wysiwyg 2.0.0-7 → 2.0.0-9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (41) hide show

package/lib/cli/commands/Command.js ADDED Viewed

@@ -0,0 +1,39 @@
+export class Command {
+    name;
+    description;
+    argument;
+    options = [];
+    doCommand() {
+        throw new Error('Command "doCommand" is required');
+    }
+    install(program) {
+        if (!this.name) {
+            throw new Error('Command "name" is required');
+        }
+        let building = program.command(this.name);
+        if (this.description) {
+            building = building.description(this.description);
+        }
+        if (this.argument) {
+            building = building.argument(this.argument);
+        }
+        if (this.options.length) {
+            for (const option of this.options) {
+                building = building.option(option.flags, option.description, option.default);
+            }
+        }
+        building.action(this.doCommand.bind(this));
+    }
+    output(data) {
+        // eslint-disable-next-line no-console
+        console.log(data);
+    }
+}

package/lib/cli/commands/ToJsonCommand.js ADDED Viewed

@@ -0,0 +1,46 @@
+import { resolve } from 'path';
+import { ContentSerializer } from '../ContentSerializer';
+import { Command } from './Command';
+export class ToJsonCommand extends Command {
+    name = 'to-json';
+    description = 'migrate html to json';
+    argument = '<html>';
+    options = [
+        {
+            flags: '--config <path>',
+            description: 'Generator config',
+            // Relative to dist folder
+            default: resolve(__dirname, '../bin/zp.config.json')
+        }
+    ];
+    doCommand(html, { config }) {
+        const configPath = resolve(process.cwd(), config);
+        const serializer = ContentSerializer.build(require(configPath).editor);
+        const json = serializer.toJSON(this.#formatInputHtml(html));
+        this.output(this.#formatOutputJson(json));
+    }
+    #formatInputHtml(html) {
+        return html
+            .replace(/\\(["'])/g, '$1')
+            .replace(/rgba\(\d{1,3}, ?\d{1,3}, ?\d{1,3}, (\d{1,2}%)\)/g, (substring, alpha) => {
+                return substring.replace(alpha, parseFloat(alpha) / 100);
+            });
+    }
+    #formatOutputJson(object) {
+        const skipNullValue = (_, value) => value === null ? undefined : value;
+        const json = JSON.stringify(object, skipNullValue, 2);
+        return json
+            .replace(/\\"/g, '"')
+            .replace(/font-family: ?'(.+)'/g, 'font-family: "$1"')
+            .replace(/'/g, '\\\'')
+            .replace(/^[\t ]*"[^:\n\r]+(?<!\\)":/gm, (match) => match.replace(/"/g, ''))
+            .replace(/: "(.+)"([,\n])/g, ': \'$1\'$2');
+    }
+}

package/lib/cli/commands/VersionCommand.js ADDED Viewed

@@ -0,0 +1,11 @@
+import { version } from '../../../package.json';
+import { Command } from './Command';
+export class VersionCommand extends Command {
+    name = 'version';
+    description = 'display cli version';
+    doCommand() {
+        this.output(version);
+    }
+}

package/lib/cli/commands/index.js ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export { ToJsonCommand } from './ToJsonCommand';
2	+ export { VersionCommand } from './VersionCommand';

package/lib/cli/index.js CHANGED Viewed

	@@ -1 +1,2 @@
1 1	export { ContentSerializer } from './ContentSerializer';
2	+ export * from './commands';

package/lib/components/base/Button.vue CHANGED Viewed

@@ -135,4 +135,10 @@ export default {
     color: rgb(var(--zw-color-white));
     background-color: rgb(var(--zw-color-n5));
 }
+.zw-button__customized-indicator {
+    position: absolute;
+    top: 0;
+    right: 2px;
+}
 </style>

package/lib/components/base/dropdown/Dropdown.vue CHANGED Viewed

@@ -1,6 +1,6 @@
 <template>
     <div class="zw-dropdown" ref="dropdownRef">
-        <DropdownActivator :color="color">
+        <DropdownActivator :color="color" :is-customized="isCustomized">
             <template #default="attrs">
                 <slot name="activator" v-bind="attrs" />
             </template>
@@ -60,6 +60,12 @@ export default {
             type: String,
             required: false,
             default: 'none'
+        },
+        isCustomized: {
+            type: Boolean,
+            required: false,
+            default: false
         }
     },

package/lib/components/base/dropdown/DropdownActivator.vue CHANGED Viewed

@@ -12,6 +12,15 @@
                     {{ activeOptionTitle }}
                 </span>
+                <Icon
+                    v-if="isCustomized"
+                    class="zw-dropdown__customized-indicator"
+                    name="indicator"
+                    size="9px"
+                    data-test-selector="customizedIndicator"
+                    v-tooltip.xs="'Default parameter setting is changed'"
+                />
                 <Icon
                     class="zw-dropdown__activator-arrow"
                     name="arrow"
@@ -27,6 +36,7 @@
 import { computed, inject, toRef } from 'vue';
 import Button from '../Button';
 import Icon from '../Icon';
+import { tooltip } from '../../../directives';
 import { InjectionTokens } from './injectionTokens';
 import { useDropdownEntityTitle } from './composables';
@@ -38,6 +48,10 @@ export default {
         Button
     },
+    directives: {
+        tooltip
+    },
     model: {
         event: 'change'
     },
@@ -47,6 +61,12 @@ export default {
             type: String,
             required: false,
             default: 'none'
+        },
+        isCustomized: {
+            type: Boolean,
+            required: false,
+            default: false
         }
     },
@@ -77,10 +97,6 @@ export default {
     width: 100%;
 }
-.zw-dropdown__activator-title {
-    margin-right: var(--zw-offset-xs);
-}
 .zw-dropdown__activator-arrow {
     margin-left: auto;
 }
@@ -94,4 +110,9 @@ export default {
     font-size: var(--zw-font-size-xxs);
     color: rgb(var(--zw-color-white));
 }
+.zw-dropdown__customized-indicator {
+    position: relative;
+    top: calc(0px - var(--zw-offset-xs));
+}
 </style>

package/lib/components/base/dropdown/__tests__/DropdownActivator.test.js CHANGED Viewed

@@ -4,6 +4,10 @@ import DropdownActivator from '../DropdownActivator';
 import { InjectionTokens } from '../injectionTokens';
 import Button from '../../Button';
+const SELECTORS = {
+    INDICATOR: '[data-test-selector="customizedIndicator"]'
+};
 const createToggler = ({ isOpened } = {}) => ({
     isOpened: ref(isOpened ?? false),
     open: jest.fn()
@@ -13,8 +17,12 @@ const createActiveOptionManager = ({ activeOption } = {}) => ({
     activeOption: ref(activeOption ?? { id: 'test' })
 });
-function createComponent({ toggler, activeOptionManager } = {}) {
+function createComponent({ toggler, isCustomized, activeOptionManager } = {}) {
     return shallowMount(DropdownActivator, {
+        propsData: {
+            isCustomized: ref(isCustomized ?? false)
+        },
         provide: {
             [InjectionTokens.TOGGLER]: toggler ?? createToggler(),
             [InjectionTokens.ACTIVE_MANAGER]: activeOptionManager ?? createActiveOptionManager()
@@ -40,6 +48,20 @@ describe('rendering', () => {
         expect(buttonWrapper.props('active')).toBe(false);
         expect(buttonWrapper.classes('zw-dropdown__activator--active')).toBeFalsy();
     });
+    test('should render indicator of customized styles', () => {
+        const toggler = createToggler({ isOpened: false });
+        const wrapper = createComponent({ toggler, isCustomized: true });
+        expect(wrapper).toVueContainComponent(SELECTORS.INDICATOR);
+    });
+    test('should not render indicator of customized styles', () => {
+        const toggler = createToggler({ isOpened: false });
+        const wrapper = createComponent({ toggler });
+        expect(wrapper).not.toVueContainComponent(SELECTORS.INDICATOR);
+    });
 });
 describe('open dropdown', () => {

package/lib/components/toolbar/controls/AlignmentControl.vue CHANGED Viewed

@@ -2,12 +2,21 @@
     <ButtonToggle :value="currentValue" :options="$options.alignments" @change="apply">
         <template #option="{ isActive, option, activate }">
             <Button
+                class="zw-position--relative"
                 icon
                 skin="toolbar"
                 :active="isActive"
                 @click="activate"
                 v-tooltip="option.tooltip"
             >
+                <Icon
+                    v-if="isCustomized && isActive"
+                    class="zw-button__customized-indicator"
+                    name="indicator"
+                    size="9px"
+                    data-test-selector="customizedIndicator"
+                    v-tooltip.xs="'Default parameter setting is changed'"
+                />
                 <Icon :name="`alignment-${option.id}`" size="28px" auto-color />
             </Button>
         </template>
@@ -17,7 +26,7 @@
 <script>
 import { inject } from 'vue';
 import { InjectionTokens } from '../../../injectionTokens';
-import { Alignments } from '../../../enums';
+import { Alignments, TextSettings } from '../../../enums';
 import { ButtonToggle, Button, Icon } from '../../base';
 import { tooltip } from '../../../directives';
@@ -57,6 +66,7 @@ export default {
         const editor = inject(InjectionTokens.EDITOR);
         const currentValue = editor.commands.getAlignment();
+        const isCustomized = editor.commands.isSettingCustomized('attributes', TextSettings.ALIGNMENT);
         function apply(value) {
             editor.chain().focus().applyAlignment(value).run();
@@ -65,6 +75,7 @@ export default {
         return {
             currentValue,
+            isCustomized,
             apply
         };
     }

package/lib/components/toolbar/controls/FontColorControl.vue CHANGED Viewed

@@ -2,6 +2,7 @@
     <ColorPicker :value="currentValue" @change="apply">
         <template #activator="{ toggle, isOpened }">
             <Button
+                class="zw-position--relative"
                 icon
                 skin="toolbar"
                 :active="isOpened"
@@ -9,6 +10,15 @@
                 v-tooltip="'Font Color'"
             >
                 <Icon name="font-color" size="28px" auto-color />
+                <Icon
+                    v-if="isCustomized"
+                    class="zw-button__customized-indicator"
+                    name="indicator"
+                    size="9px"
+                    data-test-selector="customizedIndicator"
+                    v-tooltip.xs="'Default parameter setting is changed'"
+                />
             </Button>
         </template>
     </ColorPicker>
@@ -19,6 +29,7 @@ import { inject } from 'vue';
 import { ColorPicker, Button, Icon } from '../../base';
 import { InjectionTokens } from '../../../injectionTokens';
 import { tooltip } from '../../../directives';
+import { TextSettings } from '../../../enums';
 export default {
     name: 'FontColorControl',
@@ -37,10 +48,13 @@ export default {
         const editor = inject(InjectionTokens.EDITOR);
         const currentValue = editor.commands.getFontColor();
+        const isCustomized = editor.commands.isSettingCustomized('marks', TextSettings.FONT_COLOR);
         const apply = (color) => editor.chain().applyFontColor(color).run();
         return {
             currentValue,
+            isCustomized,
             apply
         };
     }

package/lib/components/toolbar/controls/FontFamilyControl.vue CHANGED Viewed

@@ -3,6 +3,7 @@
         class="zw-font-family-control"
         :options="options"
         :value="currentValue"
+        :is-customized="isCustomized"
         @change="apply"
         v-tooltip="'Font Name'"
     >
@@ -22,6 +23,7 @@ import { computed, inject } from 'vue';
 import { InjectionTokens } from '../../../injectionTokens';
 import { tooltip } from '../../../directives';
 import { Dropdown, DropdownOption } from '../../base';
+import { TextSettings } from '../../../enums';
 import { useRecentFonts } from './composables';
 export default {
@@ -67,6 +69,7 @@ export default {
         }
         const currentValue = editor.commands.getFontFamily();
+        const isCustomized = editor.commands.isSettingCustomized('marks', TextSettings.FONT_FAMILY);
         const apply = (fontFamily) => {
             recentFontNames.add(fontFamily);
@@ -76,6 +79,7 @@ export default {
         return {
             options,
             currentValue,
+            isCustomized,
             renderOptionStyles,
             apply
         };

package/lib/components/toolbar/controls/FontSizeControl.vue CHANGED Viewed

@@ -3,6 +3,7 @@
         class="zw-font-size-control"
         :options="options"
         :value="currentValue"
+        :is-customized="isCustomized"
         @change="apply"
         v-tooltip="{ text: 'Font Size', hotkey: 'Mod Shift +/-' }"
     />
@@ -13,6 +14,7 @@ import { computed, inject } from 'vue';
 import { Dropdown } from '../../base';
 import { InjectionTokens } from '../../../injectionTokens';
 import { tooltip } from '../../../directives';
+import { TextSettings } from '../../../enums';
 export default {
     name: 'FontSizeControl',
@@ -34,11 +36,14 @@ export default {
         });
         const currentValue = editor.commands.getFontSize();
+        const isCustomized = editor.commands.isSettingCustomized('marks', TextSettings.FONT_SIZE);
         const apply = (value) => editor.chain().focus().applyFontSize(value).run();
         return {
             options,
             currentValue,
+            isCustomized,
             apply
         };
     }
@@ -47,6 +52,6 @@ export default {
 <style scoped>
 .zw-font-size-control {
-    width: 64px;
+    width: 72px;
 }
 </style>

package/lib/components/toolbar/controls/FontWeightControl.vue CHANGED Viewed

@@ -1,7 +1,9 @@
 <template>
     <Dropdown
+        class="zw-font-weight-control"
         :options="options"
         :value="currentValue"
+        :is-customized="isCustomized"
         @change="apply"
         v-tooltip="{ text: 'Font Weight', hotkey: 'Mod B' }"
     />
@@ -12,6 +14,7 @@ import { computed, inject, unref } from 'vue';
 import { InjectionTokens } from '../../../injectionTokens';
 import { Dropdown } from '../../base';
 import { tooltip } from '../../../directives';
+import { TextSettings } from '../../../enums';
 export default {
     name: 'FontWeightControl',
@@ -29,15 +32,24 @@ export default {
         const font = editor.commands.getFont();
         const options = computed(() => unref(font).weights.map((style) => ({ id: style })));
         const currentValue = editor.commands.getFontWeight();
+        const isCustomized = editor.commands.isSettingCustomized('marks', TextSettings.FONT_WEIGHT);
         const apply = (value) => editor.chain().focus().applyFontWeight(value).run();
         return {
             options,
             currentValue,
+            isCustomized,
             apply
         };
     }
 };
 </script>
+<style scoped>
+.zw-font-weight-control {
+    width: 60px;
+}
+</style>

package/lib/components/toolbar/controls/ItalicControl.vue CHANGED Viewed

@@ -1,5 +1,6 @@
 <template>
     <Button
+        class="zw-position--relative"
         skin="toolbar"
         icon
         :active="currentValue"
@@ -8,6 +9,15 @@
         v-tooltip="{ text: 'Italic', hotkey: 'Mod I' }"
     >
         <Icon name="italic" size="28px" auto-color />
+        <Icon
+            v-if="isCustomized"
+            class="zw-button__customized-indicator"
+            name="indicator"
+            size="9px"
+            data-test-selector="customizedIndicator"
+            v-tooltip.xs="'Default parameter setting is changed'"
+        />
     </Button>
 </template>
@@ -16,6 +26,7 @@ import { inject } from 'vue';
 import { Button, Icon } from '../../base';
 import { InjectionTokens } from '../../../injectionTokens';
 import { tooltip } from '../../../directives';
+import { TextSettings } from '../../../enums';
 export default {
     name: 'ItalicControl',
@@ -33,12 +44,15 @@ export default {
         const editor = inject(InjectionTokens.EDITOR);
         const currentValue = editor.commands.isItalic();
+        const isCustomized = editor.commands.isSettingCustomized('marks', TextSettings.FONT_STYLE);
         const isAvailable = editor.commands.isItalicAvailable();
         const apply = () => editor.chain().focus().toggleItalic().run();
         return {
             isAvailable,
             currentValue,
+            isCustomized,
             apply
         };
     }

package/lib/components/toolbar/controls/LineHeightControl.vue CHANGED Viewed

@@ -1,6 +1,7 @@
 <template>
     <div class="zw-position--relative" ref="wrapperRef">
         <Button
+            class="zw-position--relative"
             icon
             skin="toolbar"
             :active="isOpened"
@@ -8,6 +9,15 @@
             v-tooltip="'Line Height'"
         >
             <Icon name="line-height" size="28px" auto-color />
+            <Icon
+                v-if="isCustomized"
+                class="zw-button__customized-indicator"
+                name="indicator"
+                size="9px"
+                data-test-selector="customizedIndicator"
+                v-tooltip.xs="'Default parameter setting is changed'"
+            />
         </Button>
         <Modal class="zw-line-height-control__modal" ref="modalRef" :toggler="toggler">
@@ -44,6 +54,7 @@ import { inject, ref } from 'vue';
 import { Button, Icon, Modal, Range, NumberField, FieldLabel, useModalToggler } from '../../base';
 import { InjectionTokens } from '../../../injectionTokens';
 import { tooltip } from '../../../directives';
+import { TextSettings } from '../../../enums';
 export default {
     name: 'LineHeightControl',
@@ -66,13 +77,17 @@ export default {
         const modalRef = ref(null);
         const editor = inject(InjectionTokens.EDITOR);
         const toggler = useModalToggler({ wrapperRef, modalRef });
         const currentValue = editor.commands.getLineHeight();
+        const isCustomized = editor.commands.isSettingCustomized('attributes', TextSettings.LINE_HEIGHT);
         const apply = (value) => editor.commands.applyLineHeight(String(value));
         return {
             wrapperRef,
             modalRef,
             isOpened: toggler.isOpened,
+            isCustomized,
             toggler,
             currentValue,
             apply

package/lib/components/toolbar/controls/UnderlineControl.vue CHANGED Viewed

@@ -1,5 +1,6 @@
 <template>
     <Button
+        class="zw-position--relative"
         skin="toolbar"
         icon
         :active="currentValue"
@@ -7,6 +8,15 @@
         v-tooltip="{ text: 'Underline', hotkey: 'Mod U' }"
     >
         <Icon name="underline" size="28px" auto-color />
+        <Icon
+            v-if="isCustomized"
+            class="zw-button__customized-indicator"
+            name="indicator"
+            size="9px"
+            data-test-selector="customizedIndicator"
+            v-tooltip.xs="'Default parameter setting is changed'"
+        />
     </Button>
 </template>
@@ -32,10 +42,13 @@ export default {
         const editor = inject(InjectionTokens.EDITOR);
         const currentValue = editor.commands.isUnderline();
+        const isCustomized = editor.commands.isUnderlineCustomized();
         const apply = () => editor.chain().focus().toggleUnderline().run();
         return {
             currentValue,
+            isCustomized,
             apply
         };
     }