@zipify/wysiwyg 1.0.0-dev.62 → 1.0.0-dev.65

package/lib/Wysiwyg.vue

@@ -113,6 +113,13 @@ export default {
             default: false
         },
 
+        // Temporary until migrations static accordion to sidebar
+        popupMode: {
+            type: Boolean,
+            required: false,
+            default: false
+        },
+
         // Requires Window type but it different in iframe and outside
         // eslint-disable-next-line vue/require-prop-types
         window: {
@@ -185,6 +192,7 @@ export default {
         provide(InjectionTokens.LOCAL_STORAGE, new Storage(localStorage));
         provide(InjectionTokens.FAVORITE_COLORS, favoriteColors);
         provide(InjectionTokens.PAGE_BLOCKS, pageBlocks);
+        provide(InjectionTokens.POPUP_MODE, props.popupMode);
 
         return {
             editor,

package/lib/assets/icons/background-color.svg

@@ -1,3 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" style="width:var(--zw-icon-width);height:var(--zw-icon-height)" viewBox="0 0 28 28">
-    <path fill="var(--zw-icon-foreground)" fill-rule="evenodd" d="M22 20.62a2.42 2.42 0 0 1-4.84 0c0-1.25 2.42-4.54 2.42-4.54S22 19.37 22 20.62ZM9.92 15.425l1.452-3.951c.071-.182.145-.394.219-.636.074-.242.149-.503.226-.783a17.223 17.223 0 0 0 .454 1.402l1.452 3.968H9.919Zm5.411 4.199c.226-.795.658-1.684 1.184-2.562L12.955 8h-2.269L6 19.93h1.725a.736.736 0 0 0 .474-.157.792.792 0 0 0 .26-.347l.891-2.434h4.941l.891 2.434c.031.079.097.134.148.198Z" clip-rule="evenodd"/>
+    <path fill="#fff" stroke="#B3B3B3" d="M4.5 4.5h19v19h-19z"/>
+    <path fill="#3B3B3B" d="M26 20.7a2.51 2.51 0 0 1-5 0c0-1.31 2.5-4.7 2.5-4.7s2.5 3.39 2.5 4.7Z"/>
+    <path fill="#3B3B3B" fill-rule="evenodd" d="M19.64 19.93h-1.715a.75.75 0 0 1-.475-.145.82.82 0 0 1-.268-.359l-.89-2.433h-4.943l-.89 2.433a.78.78 0 0 1-.26.347.73.73 0 0 1-.475.157H8L12.686 8h2.269l4.686 11.93Zm-7.721-4.505h3.803l-1.452-3.968a18.048 18.048 0 0 1-.219-.623c-.08-.24-.158-.5-.235-.78-.077.28-.152.542-.227.784a8.742 8.742 0 0 1-.218.635l-1.452 3.952Z" clip-rule="evenodd"/>
 </svg>

package/lib/assets/icons/font-color.svg

@@ -1,5 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" style="width:var(--zw-icon-width);height:var(--zw-icon-height)" viewBox="0 0 28 28">
-    <path fill="#fff" stroke="#B3B3B3" d="M4.5 4.5h19v19h-19z"/>
-    <path fill="#3B3B3B" d="M26 20.7a2.51 2.51 0 0 1-5 0c0-1.31 2.5-4.7 2.5-4.7s2.5 3.39 2.5 4.7Z"/>
-    <path fill="#3B3B3B" fill-rule="evenodd" d="M19.64 19.93h-1.715a.75.75 0 0 1-.475-.145.82.82 0 0 1-.268-.359l-.89-2.433h-4.943l-.89 2.433a.78.78 0 0 1-.26.347.73.73 0 0 1-.475.157H8L12.686 8h2.269l4.686 11.93Zm-7.721-4.505h3.803l-1.452-3.968a18.048 18.048 0 0 1-.219-.623c-.08-.24-.158-.5-.235-.78-.077.28-.152.542-.227.784a8.742 8.742 0 0 1-.218.635l-1.452 3.952Z" clip-rule="evenodd"/>
+    <path fill="var(--zw-icon-foreground)" fill-rule="evenodd" d="M22 20.62a2.42 2.42 0 0 1-4.84 0c0-1.25 2.42-4.54 2.42-4.54S22 19.37 22 20.62ZM9.92 15.425l1.452-3.951c.071-.182.145-.394.219-.636.074-.242.149-.503.226-.783a17.223 17.223 0 0 0 .454 1.402l1.452 3.968H9.919Zm5.411 4.199c.226-.795.658-1.684 1.184-2.562L12.955 8h-2.269L6 19.93h1.725a.736.736 0 0 0 .474-.157.792.792 0 0 0 .26-.347l.891-2.434h4.941l.891 2.434c.031.079.097.134.148.198Z" clip-rule="evenodd"/>
 </svg>

package/lib/components/toolbar/ToolbarFull.vue

@@ -14,20 +14,35 @@
                 <FontColorControl />
                 <BackgroundColorControl />
             </ToolbarGroup>
+
+            <template v-if="isPopupMode">
+                <ToolbarDivider vertical />
+
+                <ToolbarGroup>
+                    <ItalicControl />
+                    <UnderlineControl />
+                    <StrikeThroughControl />
+                    <SuperscriptControl />
+                    <CaseStyleControl />
+                </ToolbarGroup>
+            </template>
         </ToolbarRow>
 
         <ToolbarDivider horizontal />
 
         <ToolbarRow>
-            <ToolbarGroup>
-                <ItalicControl />
-                <UnderlineControl />
-                <StrikeThroughControl />
-                <SuperscriptControl />
-                <CaseStyleControl />
-            </ToolbarGroup>
+            <template v-if="!isPopupMode">
+                <ToolbarGroup>
+                    <ItalicControl />
+                    <UnderlineControl />
+                    <StrikeThroughControl />
+                    <SuperscriptControl />
+                    <CaseStyleControl />
+                </ToolbarGroup>
+
+                <ToolbarDivider vertical />
+            </template>
 
-            <ToolbarDivider vertical />
             <AlignmentControl />
             <ToolbarDivider vertical />
 
@@ -52,6 +67,8 @@
 </template>
 
 <script>
+import { inject } from 'vue';
+import { InjectionTokens } from '../../injectionTokens';
 import ToolbarDivider from './ToolbarDivider';
 import ToolbarRow from './ToolbarRow';
 import ToolbarGroup from './ToolbarGroup';
@@ -97,6 +114,12 @@ export default {
         ListControl,
         RemoveFormatControl,
         LinkControl
+    },
+
+    setup() {
+        const isPopupMode = inject(InjectionTokens.POPUP_MODE);
+
+        return { isPopupMode };
     }
 };
 </script>

package/lib/extensions/core/TextProcessor.js

@@ -1,16 +1,5 @@
 import { Extension } from '@tiptap/vue-2';
 import { createCommand } from '../../utils';
-import {
-    emDash,
-    registeredTrademark,
-    trademark,
-    ellipsis,
-    openDoubleQuote,
-    openSingleQuote,
-    closeDoubleQuote,
-    closeSingleQuote,
-    copyright
-} from './inputRules';
 
 export const TextProcessor = Extension.create({
     name: 'text_processor',
@@ -51,17 +40,5 @@ export const TextProcessor = Extension.create({
                 });
             })
         };
-    },
-
-    addInputRules: () => [
-        emDash,
-        registeredTrademark,
-        trademark,
-        ellipsis,
-        openDoubleQuote,
-        openSingleQuote,
-        closeDoubleQuote,
-        closeSingleQuote,
-        copyright
-    ]
+    }
 });

package/lib/injectionTokens.js

@@ -4,5 +4,6 @@ export const InjectionTokens = Object.freeze({
     EDITOR: Symbol('editor'),
     LOCAL_STORAGE: Symbol('localStorage'),
     FAVORITE_COLORS: Symbol('favoriteColors'),
-    PAGE_BLOCKS: Symbol('pageBlocks')
+    PAGE_BLOCKS: Symbol('pageBlocks'),
+    POPUP_MODE: Symbol('popupMode')
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zipify/wysiwyg",
-  "version": "1.0.0-dev.62",
+  "version": "1.0.0-dev.65",
   "description": "Zipify modification of TipTap text editor",
   "main": "dist/wysiwyg.mjs",
   "repository": {

package/lib/extensions/core/inputRules/closeDoubleQuote.js

@@ -1,6 +0,0 @@
-import { textInputRule } from '@tiptap/core';
-
-export const closeDoubleQuote = textInputRule({
-    find: /"/,
-    replace: '”'
-});

package/lib/extensions/core/inputRules/closeSingleQuote.js

@@ -1,6 +0,0 @@
-import { textInputRule } from '@tiptap/core';
-
-export const closeSingleQuote = textInputRule({
-    find: /'/,
-    replace: '’'
-});

package/lib/extensions/core/inputRules/copyright.js

@@ -1,6 +0,0 @@
-import { textInputRule } from '@tiptap/core';
-
-export const copyright = textInputRule({
-    find: /\(c\)/i,
-    replace: '©'
-});

package/lib/extensions/core/inputRules/ellipsis.js

@@ -1,6 +0,0 @@
-import { textInputRule } from '@tiptap/core';
-
-export const ellipsis = textInputRule({
-    find: /\.\.\./,
-    replace: '…'
-});

package/lib/extensions/core/inputRules/emDash.js

@@ -1,6 +0,0 @@
-import { textInputRule } from '@tiptap/core';
-
-export const emDash = textInputRule({
-    find: /--/,
-    replace: '—'
-});

package/lib/extensions/core/inputRules/index.js

@@ -1,9 +0,0 @@
-export { closeDoubleQuote } from './closeDoubleQuote';
-export { closeSingleQuote } from './closeSingleQuote';
-export { copyright } from './copyright';
-export { ellipsis } from './ellipsis';
-export { emDash } from './emDash';
-export { openDoubleQuote } from './openDoubleQuote';
-export { openSingleQuote } from './openSingleQuote';
-export { registeredTrademark } from './registeredTrademark';
-export { trademark } from './trademark';

package/lib/extensions/core/inputRules/openDoubleQuote.js

@@ -1,6 +0,0 @@
-import { textInputRule } from '@tiptap/core';
-
-export const openDoubleQuote = textInputRule({
-    find: /(?:^|[\s{[(<'"\u2018\u201C])(")/,
-    replace: '“'
-});

package/lib/extensions/core/inputRules/openSingleQuote.js

@@ -1,6 +0,0 @@
-import { textInputRule } from '@tiptap/core';
-
-export const openSingleQuote = textInputRule({
-    find: /(?:^|[\s{[(<'"\u2018\u201C])(')/,
-    replace: '‘'
-});

package/lib/extensions/core/inputRules/registeredTrademark.js

@@ -1,6 +0,0 @@
-import { textInputRule } from '@tiptap/core';
-
-export const registeredTrademark = textInputRule({
-    find: /\(r\)/i,
-    replace: '®'
-});

package/lib/extensions/core/inputRules/trademark.js

@@ -1,6 +0,0 @@
-import { textInputRule } from '@tiptap/core';
-
-export const trademark = textInputRule({
-    find: /\(tm\)/i,
-    replace: '™'
-});