@modusoperandi/licit 1.0.4 → 1.0.5

package/StrongMarkSpec.js.flow

@@ -1,25 +1,25 @@
-// @flow
-
-import type { MarkSpec } from './Types.js';
-
-const STRONG_DOM = ['strong', 0];
-const CSS_BOLD_PATTERN = /^(bold(er)?|[5-9]\d{2,})$/;
-
-const StrongMarkSpec: MarkSpec = {
-  parseDOM: [
-    { tag: 'strong' },
-    // This works around a Google Docs misbehavior where
-    // pasted content will be inexplicably wrapped in `<b>`
-    // tags with a font-weight normal.
-    { tag: 'b', getAttrs: (node) => node.style.fontWeight != 'normal' && null },
-    {
-      style: 'font-weight',
-      getAttrs: (value) => CSS_BOLD_PATTERN.test(value) && null,
-    },
-  ],
-  toDOM() {
-    return STRONG_DOM;
-  },
-};
-
-export default StrongMarkSpec;
+// @flow
+
+import type { MarkSpec } from './Types.js';
+
+const STRONG_DOM = ['strong', 0];
+const CSS_BOLD_PATTERN = /^(bold(er)?|[5-9]\d{2,})$/;
+
+const StrongMarkSpec: MarkSpec = {
+  parseDOM: [
+    { tag: 'strong' },
+    // This works around a Google Docs misbehavior where
+    // pasted content will be inexplicably wrapped in `<b>`
+    // tags with a font-weight normal.
+    { tag: 'b', getAttrs: (node) => node.style.fontWeight != 'normal' && null },
+    {
+      style: 'font-weight',
+      getAttrs: (value) => CSS_BOLD_PATTERN.test(value) && null,
+    },
+  ],
+  toDOM() {
+    return STRONG_DOM;
+  },
+};
+
+export default StrongMarkSpec;

package/StyleView.js

@@ -2,7 +2,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 // temp view for custom style have to check this view is needed?
 
@@ -13,7 +13,7 @@ export var StyleView = /*#__PURE__*/function () {
     _classCallCheck(this, StyleView);
     this.update(editorView, null);
   }
-  _createClass(StyleView, [{
+  return _createClass(StyleView, [{
     key: "update",
     value: function update(view, lastState) {
       if (view.readOnly) {
@@ -25,5 +25,4 @@ export var StyleView = /*#__PURE__*/function () {
     key: "destroy",
     value: function destroy() {}
   }]);
-  return StyleView;
 }();

package/StyleView.js.flow

@@ -1,19 +1,19 @@
-// temp view for custom style have to check this view is needed?
-
-import { EditorView } from 'prosemirror-view';
-import { EditorState } from 'prosemirror-state';
-
-export class StyleView {
-  constructor(editorView: EditorView) {
-    this.update(editorView, null);
-  }
-
-  update(view: EditorView, lastState: EditorState): void {
-    if (view.readOnly) {
-      this.destroy();
-      return;
-    }
-  }
-
-  destroy() {}
-}
+// temp view for custom style have to check this view is needed?
+
+import { EditorView } from 'prosemirror-view';
+import { EditorState } from 'prosemirror-state';
+
+export class StyleView {
+  constructor(editorView: EditorView) {
+    this.update(editorView, null);
+  }
+
+  update(view: EditorView, lastState: EditorState): void {
+    if (view.readOnly) {
+      this.destroy();
+      return;
+    }
+  }
+
+  destroy() {}
+}

package/TableBackgroundColorCommand.js

@@ -4,26 +4,27 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import nullthrows from 'nullthrows';
 import { EditorState } from 'prosemirror-state';
 import { setCellAttr } from 'prosemirror-tables';
 import { Transform } from 'prosemirror-transform';
 import { EditorView } from 'prosemirror-view';
-import { ColorEditor } from '@modusoperandi/licit-ui-commands';
 import { atAnchorRight } from '@modusoperandi/licit-ui-commands';
 import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
 import { createPopUp } from '@modusoperandi/licit-ui-commands';
+import { ColorEditor } from '@modusoperandi/color-picker';
+import { findNodesWithSameMark } from '@modusoperandi/licit-ui-commands';
+import { MARK_TEXT_COLOR } from '@modusoperandi/licit-ui-commands';
 var setCellBackgroundBlack = setCellAttr('background', '#000000');
 var TableBackgroundColorCommand = /*#__PURE__*/function (_UICommand) {
-  _inherits(TableBackgroundColorCommand, _UICommand);
   function TableBackgroundColorCommand() {
     var _this;
     _classCallCheck(this, TableBackgroundColorCommand);
@@ -31,14 +32,14 @@ var TableBackgroundColorCommand = /*#__PURE__*/function (_UICommand) {
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, TableBackgroundColorCommand, [].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "_popUp", null);
-    _defineProperty(_assertThisInitialized(_this), "shouldRespondToUIEvent", function (e) {
+    _defineProperty(_this, "_popUp", null);
+    _defineProperty(_this, "shouldRespondToUIEvent", function (e) {
       return e.type === UICommand.EventType.MOUSEENTER;
     });
-    _defineProperty(_assertThisInitialized(_this), "isEnabled", function (state) {
+    _defineProperty(_this, "isEnabled", function (state) {
       return setCellBackgroundBlack(state.tr);
     });
-    _defineProperty(_assertThisInitialized(_this), "waitForUserInput", function (state, dispatch, view, event) {
+    _defineProperty(_this, "waitForUserInput", function (state, dispatch, view, event) {
       if (_this._popUp) {
         return Promise.resolve(undefined);
       }
@@ -46,10 +47,22 @@ var TableBackgroundColorCommand = /*#__PURE__*/function (_UICommand) {
       if (!(target instanceof HTMLElement)) {
         return Promise.resolve(undefined);
       }
+      var doc = state.doc,
+        selection = state.selection,
+        schema = state.schema;
+      var markType = schema.marks[MARK_TEXT_COLOR];
+      var from = selection.from,
+        to = selection.to;
+      var result = findNodesWithSameMark(doc, from, to, markType);
       var anchor = event ? event.currentTarget : null;
+      var hex = result ? result.mark.attrs.color : null;
       return new Promise(function (resolve) {
-        _this._popUp = createPopUp(ColorEditor, null, {
+        _this._popUp = createPopUp(ColorEditor, {
+          hex: hex,
+          runtime: view.runtime
+        }, {
           anchor: anchor,
+          autoDismiss: false,
           position: atAnchorRight,
           onClose: function onClose(val) {
             if (_this._popUp) {
@@ -60,7 +73,7 @@ var TableBackgroundColorCommand = /*#__PURE__*/function (_UICommand) {
         });
       });
     });
-    _defineProperty(_assertThisInitialized(_this), "executeWithUserInput", function (state, dispatch, view, hex) {
+    _defineProperty(_this, "executeWithUserInput", function (state, dispatch, view, hex) {
       if (dispatch && hex !== undefined) {
         var cmd = setCellAttr('background', hex);
         cmd(state, dispatch, view);
@@ -70,12 +83,12 @@ var TableBackgroundColorCommand = /*#__PURE__*/function (_UICommand) {
     });
     return _this;
   }
-  _createClass(TableBackgroundColorCommand, [{
+  _inherits(TableBackgroundColorCommand, _UICommand);
+  return _createClass(TableBackgroundColorCommand, [{
     key: "cancel",
     value: function cancel() {
       this._popUp && this._popUp.close(undefined);
     }
   }]);
-  return TableBackgroundColorCommand;
 }(UICommand);
 export default TableBackgroundColorCommand;

package/TableBackgroundColorCommand.js.flow

@@ -1,75 +1,83 @@
-// @flow
-
-import nullthrows from 'nullthrows';
-import { EditorState } from 'prosemirror-state';
-import { setCellAttr } from 'prosemirror-tables';
-import { Transform } from 'prosemirror-transform';
-import { EditorView } from 'prosemirror-view';
-
-import { ColorEditor } from '@modusoperandi/licit-ui-commands';
-import { atAnchorRight } from '@modusoperandi/licit-ui-commands';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import { createPopUp } from '@modusoperandi/licit-ui-commands';
-
-const setCellBackgroundBlack = setCellAttr('background', '#000000');
-
-class TableBackgroundColorCommand extends UICommand {
-  _popUp = null;
-
-  shouldRespondToUIEvent = (e: SyntheticEvent<> | MouseEvent): boolean => {
-    return e.type === UICommand.EventType.MOUSEENTER;
-  };
-
-  isEnabled = (state: EditorState): boolean => {
-    return setCellBackgroundBlack(state.tr);
-  };
-
-  waitForUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    event: ?SyntheticEvent<>
-  ): Promise<any> => {
-    if (this._popUp) {
-      return Promise.resolve(undefined);
-    }
-    const target = nullthrows(event).currentTarget;
-    if (!(target instanceof HTMLElement)) {
-      return Promise.resolve(undefined);
-    }
-
-    const anchor = event ? event.currentTarget : null;
-    return new Promise((resolve) => {
-      this._popUp = createPopUp(ColorEditor, null, {
-        anchor,
-        position: atAnchorRight,
-        onClose: (val) => {
-          if (this._popUp) {
-            this._popUp = null;
-            resolve(val);
-          }
-        },
-      });
-    });
-  };
-
-  executeWithUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    hex: ?string
-  ): boolean => {
-    if (dispatch && hex !== undefined) {
-      const cmd = setCellAttr('background', hex);
-      cmd(state, dispatch, view);
-      return true;
-    }
-    return false;
-  };
-
-  cancel(): void {
-    this._popUp && this._popUp.close(undefined);
-  }
-}
-
-export default TableBackgroundColorCommand;
+// @flow
+
+import nullthrows from 'nullthrows';
+import { EditorState } from 'prosemirror-state';
+import { setCellAttr } from 'prosemirror-tables';
+import { Transform } from 'prosemirror-transform';
+import { EditorView } from 'prosemirror-view';
+import { atAnchorRight } from '@modusoperandi/licit-ui-commands';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+import { createPopUp } from '@modusoperandi/licit-ui-commands';
+import { ColorEditor } from '@modusoperandi/color-picker';
+import {findNodesWithSameMark} from '@modusoperandi/licit-ui-commands';
+import { MARK_TEXT_COLOR } from '@modusoperandi/licit-ui-commands';
+
+const setCellBackgroundBlack = setCellAttr('background', '#000000');
+
+class TableBackgroundColorCommand extends UICommand {
+  _popUp = null;
+
+  shouldRespondToUIEvent = (e: SyntheticEvent<> | MouseEvent): boolean => {
+    return e.type === UICommand.EventType.MOUSEENTER;
+  };
+
+  isEnabled = (state: EditorState): boolean => {
+    return setCellBackgroundBlack(state.tr);
+  };
+
+  waitForUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    event: ?SyntheticEvent<>
+  ): Promise<any> => {
+    if (this._popUp) {
+      return Promise.resolve(undefined);
+    }
+    const target = nullthrows(event).currentTarget;
+    if (!(target instanceof HTMLElement)) {
+      return Promise.resolve(undefined);
+    }
+    const { doc, selection, schema } = state;
+    const markType = schema.marks[MARK_TEXT_COLOR];
+    const { from, to } = selection;
+    const result = findNodesWithSameMark(doc, from, to, markType);
+    const anchor = event ? event.currentTarget : null;
+    const hex = result ? result.mark.attrs.color : null;
+
+    return new Promise((resolve) => {
+      this._popUp = createPopUp(ColorEditor,{ hex, runtime: view.runtime },
+        {
+        anchor,
+        autoDismiss: false,
+        position: atAnchorRight,
+        onClose: (val) => {
+          if (this._popUp) {
+            this._popUp = null;
+            resolve(val);
+          }
+        },
+      });
+    });
+  };
+
+  executeWithUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    hex: ?string
+  ): boolean => {
+    if (dispatch && hex !== undefined) {
+      const cmd = setCellAttr('background', hex);
+      cmd(state, dispatch, view);
+      return true;
+    }
+    return false;
+  };
+
+  cancel(): void {
+    this._popUp && this._popUp.close(undefined);
+  }
+}
+
+export default TableBackgroundColorCommand;

package/TableBorderColorCommand.js

@@ -4,26 +4,27 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import nullthrows from 'nullthrows';
 import { EditorState } from 'prosemirror-state';
 import { setCellAttr } from 'prosemirror-tables';
 import { Transform } from 'prosemirror-transform';
 import { EditorView } from 'prosemirror-view';
-import { ColorEditor } from '@modusoperandi/licit-ui-commands';
+import { ColorEditor } from '@modusoperandi/color-picker';
 import { atAnchorRight } from '@modusoperandi/licit-ui-commands';
 import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
 import { createPopUp } from '@modusoperandi/licit-ui-commands';
+import { findNodesWithSameMark } from '@modusoperandi/licit-ui-commands';
+import { MARK_TEXT_COLOR } from '@modusoperandi/licit-ui-commands';
 var setCellBorderBlack = setCellAttr('borderColor', '#000000');
 var TableBorderColorCommand = /*#__PURE__*/function (_UICommand) {
-  _inherits(TableBorderColorCommand, _UICommand);
   function TableBorderColorCommand() {
     var _this;
     _classCallCheck(this, TableBorderColorCommand);
@@ -31,14 +32,14 @@ var TableBorderColorCommand = /*#__PURE__*/function (_UICommand) {
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, TableBorderColorCommand, [].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "_popUp", null);
-    _defineProperty(_assertThisInitialized(_this), "shouldRespondToUIEvent", function (e) {
+    _defineProperty(_this, "_popUp", null);
+    _defineProperty(_this, "shouldRespondToUIEvent", function (e) {
       return e.type === UICommand.EventType.MOUSEENTER;
     });
-    _defineProperty(_assertThisInitialized(_this), "isEnabled", function (state) {
+    _defineProperty(_this, "isEnabled", function (state) {
       return setCellBorderBlack(state.tr);
     });
-    _defineProperty(_assertThisInitialized(_this), "waitForUserInput", function (state, dispatch, view, event) {
+    _defineProperty(_this, "waitForUserInput", function (state, dispatch, view, event) {
       if (_this._popUp) {
         return Promise.resolve(undefined);
       }
@@ -46,10 +47,22 @@ var TableBorderColorCommand = /*#__PURE__*/function (_UICommand) {
       if (!(target instanceof HTMLElement)) {
         return Promise.resolve(undefined);
       }
+      var doc = state.doc,
+        selection = state.selection,
+        schema = state.schema;
+      var markType = schema.marks[MARK_TEXT_COLOR];
+      var from = selection.from,
+        to = selection.to;
+      var result = findNodesWithSameMark(doc, from, to, markType);
       var anchor = event ? event.currentTarget : null;
+      var hex = result ? result.mark.attrs.color : null;
       return new Promise(function (resolve) {
-        _this._popUp = createPopUp(ColorEditor, null, {
+        _this._popUp = createPopUp(ColorEditor, {
+          hex: hex,
+          runtime: view.runtime
+        }, {
           anchor: anchor,
+          autoDismiss: false,
           position: atAnchorRight,
           onClose: function onClose(val) {
             if (_this._popUp) {
@@ -60,7 +73,7 @@ var TableBorderColorCommand = /*#__PURE__*/function (_UICommand) {
         });
       });
     });
-    _defineProperty(_assertThisInitialized(_this), "executeWithUserInput", function (state, dispatch, view, color) {
+    _defineProperty(_this, "executeWithUserInput", function (state, dispatch, view, color) {
       if (dispatch && color !== undefined) {
         var cmd = setCellAttr('borderColor', color);
         cmd(state, dispatch, view);
@@ -70,12 +83,12 @@ var TableBorderColorCommand = /*#__PURE__*/function (_UICommand) {
     });
     return _this;
   }
-  _createClass(TableBorderColorCommand, [{
+  _inherits(TableBorderColorCommand, _UICommand);
+  return _createClass(TableBorderColorCommand, [{
     key: "cancel",
     value: function cancel() {
       this._popUp && this._popUp.close(undefined);
     }
   }]);
-  return TableBorderColorCommand;
 }(UICommand);
 export default TableBorderColorCommand;

package/TableBorderColorCommand.js.flow

@@ -1,75 +1,86 @@
-// @flow
-
-import nullthrows from 'nullthrows';
-import { EditorState } from 'prosemirror-state';
-import { setCellAttr } from 'prosemirror-tables';
-import { Transform } from 'prosemirror-transform';
-import { EditorView } from 'prosemirror-view';
-
-import { ColorEditor } from '@modusoperandi/licit-ui-commands';
-import { atAnchorRight } from '@modusoperandi/licit-ui-commands';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import { createPopUp } from '@modusoperandi/licit-ui-commands';
-
-const setCellBorderBlack = setCellAttr('borderColor', '#000000');
-
-class TableBorderColorCommand extends UICommand {
-  _popUp = null;
-
-  shouldRespondToUIEvent = (e: SyntheticEvent<> | MouseEvent): boolean => {
-    return e.type === UICommand.EventType.MOUSEENTER;
-  };
-
-  isEnabled = (state: EditorState): boolean => {
-    return setCellBorderBlack(state.tr);
-  };
-
-  waitForUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    event: ?SyntheticEvent<>
-  ): Promise<any> => {
-    if (this._popUp) {
-      return Promise.resolve(undefined);
-    }
-    const target = nullthrows(event).currentTarget;
-    if (!(target instanceof HTMLElement)) {
-      return Promise.resolve(undefined);
-    }
-
-    const anchor = event ? event.currentTarget : null;
-    return new Promise((resolve) => {
-      this._popUp = createPopUp(ColorEditor, null, {
-        anchor,
-        position: atAnchorRight,
-        onClose: (val) => {
-          if (this._popUp) {
-            this._popUp = null;
-            resolve(val);
-          }
-        },
-      });
-    });
-  };
-
-  executeWithUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    color: ?string
-  ): boolean => {
-    if (dispatch && color !== undefined) {
-      const cmd = setCellAttr('borderColor', color);
-      cmd(state, dispatch, view);
-      return true;
-    }
-    return false;
-  };
-
-  cancel(): void {
-    this._popUp && this._popUp.close(undefined);
-  }
-}
-
-export default TableBorderColorCommand;
+// @flow
+
+import nullthrows from 'nullthrows';
+import { EditorState } from 'prosemirror-state';
+import { setCellAttr } from 'prosemirror-tables';
+import { Transform } from 'prosemirror-transform';
+import { EditorView } from 'prosemirror-view';
+import { ColorEditor } from '@modusoperandi/color-picker';
+import { atAnchorRight } from '@modusoperandi/licit-ui-commands';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+import { createPopUp } from '@modusoperandi/licit-ui-commands';
+import {findNodesWithSameMark} from '@modusoperandi/licit-ui-commands';
+import { MARK_TEXT_COLOR } from '@modusoperandi/licit-ui-commands';
+
+
+
+const setCellBorderBlack = setCellAttr('borderColor', '#000000');
+
+class TableBorderColorCommand extends UICommand {
+  _popUp = null;
+
+  shouldRespondToUIEvent = (e: SyntheticEvent<> | MouseEvent): boolean => {
+    return e.type === UICommand.EventType.MOUSEENTER;
+  };
+
+  isEnabled = (state: EditorState): boolean => {
+    return setCellBorderBlack(state.tr);
+  };
+
+  waitForUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    event: ?SyntheticEvent<>
+  ): Promise<any> => {
+    if (this._popUp) {
+      return Promise.resolve(undefined);
+    }
+    const target = nullthrows(event).currentTarget;
+    if (!(target instanceof HTMLElement)) {
+      return Promise.resolve(undefined);
+    }
+    const { doc, selection, schema } = state;
+    const markType = schema.marks[MARK_TEXT_COLOR];
+    const { from, to } = selection;
+    const result = findNodesWithSameMark(doc, from, to, markType);
+
+    const anchor = event ? event.currentTarget : null;
+    const hex = result ? result.mark.attrs.color : null;
+
+    return new Promise((resolve) => {
+      this._popUp = createPopUp(ColorEditor,{ hex, runtime: view.runtime },
+        {
+        anchor,
+        autoDismiss: false,
+        position: atAnchorRight,
+        onClose: (val) => {
+          if (this._popUp) {
+            this._popUp = null;
+            resolve(val);
+          }
+        },
+      });
+    });
+  };
+
+  executeWithUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    color: ?string
+  ): boolean => {
+    if (dispatch && color !== undefined) {
+      const cmd = setCellAttr('borderColor', color);
+      cmd(state, dispatch, view);
+      return true;
+    }
+    return false;
+  };
+
+  cancel(): void {
+    this._popUp && this._popUp.close(undefined);
+  }
+}
+
+export default TableBorderColorCommand;