@zipify/wysiwyg 2.0.0-1 → 2.0.0-2

package/lib/utils/__tests__/isNodeFullySelected.test.js

@@ -0,0 +1,53 @@
+import { isNodeFullySelected } from '../isNodeFullySelected';
+
+const createResolvedPosition = (attrs = {}) => ({
+    pos: 0,
+    path: [],
+    ...attrs
+});
+
+const createNode = (attrs = {}) => ({ ...attrs });
+
+describe('is node fully selected', () => {
+    test('should return false if selected part of text node', () => {
+        const paragraph = createNode();
+        const isSelected = isNodeFullySelected(
+            createResolvedPosition({ pos: 7, path: [createNode(), 0, 0, paragraph, 0, 1] }),
+            createResolvedPosition({ pos: 12, path: [createNode(), 0, 0, paragraph, 0, 1] }),
+            paragraph,
+            0
+        );
+
+        expect(isSelected).toBe(false);
+    });
+
+    test('should return true if selected paragraph node', () => {
+        const paragraph = createNode({ nodeSize: 245 });
+        const isSelected = isNodeFullySelected(
+            createResolvedPosition({ pos: 1, path: [createNode(), 0, 0, paragraph, 0, 1] }),
+            createResolvedPosition({ pos: 244, path: [createNode(), 0, 0, paragraph, 0, 1] }),
+            paragraph,
+            0
+        );
+
+        expect(isSelected).toBe(true);
+    });
+
+    test('should return true if selected list item node', () => {
+        const listItem = createNode({ nodeSize: 247 });
+        const isSelected = isNodeFullySelected(
+            createResolvedPosition({
+                pos: 3,
+                path: [createNode(), 0, 0, createNode(), 0, 1, listItem, 0, 2, createNode(), 0, 3]
+            }),
+            createResolvedPosition({
+                pos: 246,
+                path: [createNode(), 0, 0, createNode(), 0, 1, listItem, 0, 2, createNode(), 0, 3]
+            }),
+            listItem,
+            1
+        );
+
+        expect(isSelected).toBe(true);
+    });
+});

package/lib/utils/__tests__/resolveTextPosition.test.js

@@ -0,0 +1,39 @@
+import { resolveTextPosition } from '../resolveTextPosition';
+
+const createPosition = (pos) => ({ pos });
+const createNode = (attrs) => ({ nodeSize: 0, ...attrs });
+
+describe('resolve text position', () => {
+    test('should resolve position in node range', () => {
+        const position = resolveTextPosition(
+            createPosition(2),
+            createPosition(5),
+            createNode({ nodeSize: 10 }),
+            1
+        );
+
+        expect(position).toEqual({ from: 2, to: 5 });
+    });
+
+    test('should limit start value by node start position', () => {
+        const position = resolveTextPosition(
+            createPosition(2),
+            createPosition(5),
+            createNode({ nodeSize: 10 }),
+            3
+        );
+
+        expect(position).toEqual({ from: 3, to: 5 });
+    });
+
+    test('should limit start value by node end position', () => {
+        const position = resolveTextPosition(
+            createPosition(2),
+            createPosition(15),
+            createNode({ nodeSize: 10 }),
+            1
+        );
+
+        expect(position).toEqual({ from: 2, to: 11 });
+    });
+});

package/lib/utils/index.js

@@ -8,7 +8,6 @@ export { convertFontSize } from './convertFontSize';
 export { convertAlignment } from './convertAlignment';
 export { importIcon } from './importIcon';
 export { isWysiwygContent, markWysiwygContent, unmarkWysiwygContent } from './isWysiwygContent';
-export { resolveNodePosition } from './resolveNodePosition';
 export { resolveTextPosition } from './resolveTextPosition';
 export { isNodeFullySelected } from './isNodeFullySelected';
 export { isMarkAppliedToParent } from './isMarkAppliedToParent';

package/lib/utils/isMarkAppliedToParent.js

@@ -1,4 +1,4 @@
-export function isMarkAppliedToParent({ doc }, position, checkingMark) {
+export function isMarkAppliedToParent(doc, position, checkingMark) {
     const steps = doc.resolve(position).path.reverse();
 
     for (const step of steps) {

package/lib/utils/isNodeFullySelected.js

@@ -1,10 +1,14 @@
-import { resolveNodePosition } from './resolveNodePosition';
+function resolveNodeTextOffset({ path }, node) {
+    const nodes = path.filter((step) => typeof step === 'object');
+    const index = nodes.indexOf(node);
+
+    return nodes.slice(index).reverse().length;
+}
 
 export function isNodeFullySelected($from, $to, node, position) {
-    const fromPosition = resolveNodePosition($from, node, -1);
-    const toPosition = resolveNodePosition($to, node, 1);
-    const isFromMatch = fromPosition <= position;
-    const isToMatch = toPosition >= node.nodeSize + position;
+    const offset = resolveNodeTextOffset($from, node);
+    const isFromMatch = $from.pos - offset <= position;
+    const isToMatch = $to.pos + offset >= node.nodeSize + position;
 
     return isFromMatch && isToMatch;
 }

package/lib/utils/resolveTextPosition.js

@@ -1,6 +1,4 @@
-export function resolveTextPosition($from, $to, node, position) {
-    return {
-        from: Math.max(position, $from.pos),
-        to: Math.min(position + node.nodeSize, $to.pos)
-    };
-}
+export const resolveTextPosition = ($from, $to, node, position) => ({
+    from: Math.max(position, $from.pos),
+    to: Math.min(position + node.nodeSize, $to.pos)
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zipify/wysiwyg",
-  "version": "2.0.0-1",
+  "version": "2.0.0-2",
   "description": "Zipify modification of TipTap text editor",
   "main": "dist/wysiwyg.mjs",
   "bin": {
@@ -32,17 +32,17 @@
   },
   "dependencies": {
     "@popperjs/core": "^2.11.6",
-    "@tiptap/core": "^2.0.0-beta.183",
-    "@tiptap/extension-document": "^2.0.0-beta.17",
-    "@tiptap/extension-heading": "^2.0.0-beta.29",
-    "@tiptap/extension-history": "^2.0.0-beta.26",
-    "@tiptap/extension-link": "^2.0.0-beta.43",
-    "@tiptap/extension-list-item": "^2.0.0-beta.23",
-    "@tiptap/extension-paragraph": "^2.0.0-beta.26",
-    "@tiptap/extension-placeholder": "^2.0.0-beta.53",
-    "@tiptap/extension-superscript": "^2.0.0-beta.13",
-    "@tiptap/extension-text": "^2.0.0-beta.17",
-    "@tiptap/vue-2": "^2.0.0-beta.85",
+    "@tiptap/core": "^2.0.0-beta.195",
+    "@tiptap/extension-document": "^2.0.0-beta.195",
+    "@tiptap/extension-heading": "^2.0.0-beta.195",
+    "@tiptap/extension-history": "^2.0.0-beta.195",
+    "@tiptap/extension-link": "^2.0.0-beta.195",
+    "@tiptap/extension-list-item": "^2.0.0-beta.195",
+    "@tiptap/extension-paragraph": "^2.0.0-beta.195",
+    "@tiptap/extension-placeholder": "^2.0.0-beta.195",
+    "@tiptap/extension-superscript": "^2.0.0-beta.195",
+    "@tiptap/extension-text": "^2.0.0-beta.195",
+    "@tiptap/vue-2": "^2.0.0-beta.195",
     "commander": "^9.4.0",
     "jsdom": "^20.0.0",
     "lodash": "^4.17.21",
@@ -53,36 +53,36 @@
     "vue": "^2.7"
   },
   "devDependencies": {
-    "@babel/core": "^7.19.0",
-    "@babel/eslint-parser": "^7.18.9",
-    "@babel/plugin-transform-runtime": "^7.18.10",
-    "@babel/preset-env": "^7.19.0",
+    "@babel/core": "^7.19.1",
+    "@babel/eslint-parser": "^7.19.1",
+    "@babel/plugin-transform-runtime": "^7.19.1",
+    "@babel/preset-env": "^7.19.1",
     "@babel/runtime": "^7.19.0",
     "@optimize-lodash/rollup-plugin": "^3.0.0",
     "@rollup/plugin-babel": "^5.3.1",
     "@rollup/plugin-commonjs": "^22.0.2",
-    "@rollup/plugin-node-resolve": "^14.0.0",
+    "@rollup/plugin-node-resolve": "^14.1.0",
     "@rollup/plugin-replace": "^4.0.0",
     "@vue/test-utils": "^1.3.0",
-    "@vue/vue2-jest": "^29.0.0",
+    "@vue/vue2-jest": "^29.1.0",
     "@zipify/colorpicker": "^2.2.1",
-    "babel-jest": "^29.0.2",
-    "eslint": "8.22.0",
+    "babel-jest": "^29.0.3",
+    "eslint": "8.23.1",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-vue": "^9.4.0",
+    "eslint-plugin-vue": "^9.5.1",
     "gzipper": "^7.1.0",
     "husky": "^8.0.1",
-    "jest": "^29.0.2",
-    "jest-environment-jsdom": "^29.0.2",
+    "jest": "^29.0.3",
+    "jest-environment-jsdom": "^29.0.3",
     "lint-staged": "^13.0.3",
     "npm-run-all": "^4.1.5",
     "postcss-html": "^1.5.0",
-    "release-it": "^15.4.1",
+    "release-it": "^15.4.2",
     "rollup": "^2.79.0",
     "rollup-plugin-terser": "^7.0.2",
-    "stylelint": "^14.11.0",
+    "stylelint": "^14.12.0",
     "svgo": "^2.8.0",
-    "vite": "^3.1.0",
+    "vite": "^3.1.2",
     "vite-plugin-vue2": "^2.0.2",
     "vue": "^2.7.10",
     "vue-template-compiler": "^2.7.10"

package/lib/utils/resolveNodePosition.js

@@ -1,6 +0,0 @@
-export function resolveNodePosition({ path, pos }, node, modifier) {
-    const index = path.indexOf(node);
-    const slice = path.slice(index).reverse().filter((step) => typeof step === 'object');
-
-    return pos + (modifier * slice.length);
-}