@modusoperandi/licit-vignette 1.0.1 → 1.1.2

package/VignetteNodeSpec.js

@@ -54,12 +54,13 @@ export const VignetteTableCellNodeSpec = (nodespec) => ({
     ],
     toDOM(node) {
         const base = nodespec.toDOM(node);
+        const borderColor = node.attrs.borderColor || '#36598d';
         if (node.attrs.vignette &&
             Array.isArray(base) &&
             1 < base.length &&
             base[1].style) {
             base[1].style +=
-                'border-radius: 10px; border:none!important; box-shadow: inset 0 0 0 1px #36598d;';
+                `border-radius: 10px; border:none!important; box-shadow: inset 0 0 0 1px ${borderColor};`;
         }
         base[1].vignette = node.attrs.vignette;
         return base;

package/VignettePlugin.d.ts

@@ -7,6 +7,6 @@ export declare class VignettePlugin extends Plugin {
     constructor();
     getEffectiveSchema(schema: Schema): Schema;
     initButtonCommands(): {
-        '[crop] Insert Vignette': VignetteCommand;
+        '[vignette] Insert Vignette': VignetteCommand;
     };
 }

package/VignettePlugin.js

@@ -33,7 +33,7 @@ export class VignettePlugin extends Plugin {
     }
     initButtonCommands() {
         return {
-            '[crop] Insert Vignette': new VignetteCommand(),
+            '[vignette] Insert Vignette': new VignetteCommand(),
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modusoperandi/licit-vignette",
-  "version": "1.0.1",
+  "version": "1.1.2",
   "type": "module",
   "subversion": "1",
   "description": "Vignette plugin built with ProseMirror",
@@ -21,10 +21,14 @@
     "test": "jest --coverage",
     "debug": "node --debug-brk --inspect ./node_modules/.bin/jest -i",
     "ci:bom": "cyclonedx-npm --ignore-npm-errors --short-PURLs --output-format XML --output-file dist/bom.xml",
-    "ci:build": "tsc --build && copyfiles --up 1 \"src/**/*.css\" dist  && copyfiles package.json dist"
+    "ci:build": "tsc --build && copyfiles --up 1 \"src/**/*.css\" dist  && copyfiles package.json dist",
+    "verify": "npm run lint -- --fix && npm run ci:build && npm run test:coverage && echo 'All Tests Passed!'"
   },
   "peerDependencies": {
-    "@modusoperandi/licit-ui-commands": "^1.0.0"
+    "@modusoperandi/licit-ui-commands": "^1.0.8"
+  },
+  "dependencies": {
+    "@modusoperandi/color-picker": "^1.0.4"
   },
   "devDependencies": {
     "@cyclonedx/cyclonedx-npm": "^1.11.0",
@@ -34,7 +38,7 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/jest": "^29.2.0",
     "@types/node": "^22.0.0",
-    "@types/react": "^18.3.3",
+    "@types/react": "^19.0.3",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "ajv": "^8.12.0",

package/tsconfig.prod.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../src/index.ts"],"version":"5.6.2"}

package/ui/TableColorCommand.js

@@ -1,7 +1,7 @@
 // @flow
-import nullthrows from 'nullthrows';
 import { setCellAttr } from 'prosemirror-tables';
-import { ColorEditor, atAnchorRight, createPopUp, } from '@modusoperandi/licit-ui-commands';
+import { atAnchorRight, createPopUp, findNodesWithSameMark, MARK_TEXT_COLOR, RuntimeService, } from '@modusoperandi/licit-ui-commands';
+import { ColorEditor } from '@modusoperandi/color-picker';
 import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
 export class TableColorCommand extends UICommand {
     _popUp = null;
@@ -18,15 +18,27 @@ export class TableColorCommand extends UICommand {
         if (this._popUp) {
             return Promise.resolve(undefined);
         }
-        const target = nullthrows(event).currentTarget;
+        const target = event?.currentTarget;
         if (!(target instanceof HTMLElement)) {
             return Promise.resolve(undefined);
         }
+        const { doc, selection, schema } = _state;
+        const { from, to } = selection;
+        const markType = schema.marks[MARK_TEXT_COLOR];
+        const result = findNodesWithSameMark(doc, from, to, markType);
+        const hex = result?.mark.attrs.color ?? null;
         const anchor = event?.currentTarget;
+        const node = _state.tr.doc.nodeAt(from);
+        const Textmark = node?.marks.find((mark) => mark?.attrs?.color);
+        const Textcolor = Textmark?.attrs?.color;
+        // [FS] KNITE-1489 2024-12-25
+        // Fix:VIgnette Color and Border Palette GUIs should match GUIs of Font and Background tools in Doc Edit View
         return new Promise((resolve) => {
-            this._popUp = createPopUp(ColorEditor, null, {
+            this._popUp = createPopUp(ColorEditor, { hex, runtime: RuntimeService.Runtime, Textcolor }, {
                 anchor,
                 position: atAnchorRight,
+                popUpId: 'mo-menuList-child',
+                autoDismiss: true,
                 onClose: (val) => {
                     if (this._popUp) {
                         this._popUp = null;