@titaui/pc 1.10.39 → 1.10.40

package/lib/components/rich-editor/plugins/inline/color/selector.js

@@ -91,7 +91,8 @@ function ColorSelector(_ref) {
         style: {
           backgroundColor: color
         },
-        onClick: function onClick() {
+        onClick: function onClick(e) {
+          e.stopPropagation();
           onClickItem(editor.state.schema.marks[_index2.BACKGROUND_COLOR_SCHEMA_NAME], color);
         }
       }));
@@ -106,7 +107,10 @@ function ColorSelector(_ref) {
     return colors;
   }, [background]);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls
+    className: preCls,
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + '__title'
   }, "\u6587\u5B57\u989C\u8272"), /*#__PURE__*/_react["default"].createElement("div", {
@@ -216,12 +220,6 @@ function ColorSelectorPop(_ref2) {
   }, [activeColor, activeBackground]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + '__icon',
-    onMouseOver: function onMouseOver(e) {
-      return e.stopPropagation();
-    },
-    onMouseEnter: function onMouseEnter(e) {
-      return e.stopPropagation();
-    },
     style: {
       backgroundColor: activeBackground || _consts.BackgroundColor["default"],
       color: activeColor || _consts.FontColor["default"]

package/lib/components/rich-editor/ui/editor/index.css

@@ -19,6 +19,7 @@
   font-weight: 500;
   color: #141c28;
   line-height: 38px;
+  padding: 36px 0 20px;
 }
 
 .tita-rich-editor h2 {
@@ -26,6 +27,7 @@
   font-weight: 500;
   color: #141c28;
   line-height: 32px;
+  padding: 20px 0 8px;
 }
 
 .tita-rich-editor h3 {
@@ -33,6 +35,7 @@
   font-weight: 500;
   color: #3f4755;
   line-height: 30px;
+  padding: 18px 0 8px;
 }
 
 .tita-rich-editor p {

package/lib/components/rich-editor/ui/editor/index.js

@@ -70,13 +70,16 @@ function RichEditor(_ref, ref) {
       plugins: nativePlugins
     };
 
-    var state = _prosemirrorState.EditorState.create(stateConf);
+    var state = _prosemirrorState.EditorState.create(stateConf); // debugger
+
 
     if (defaultState) {
       try {
         var jsonState = typeof defaultState == 'string' ? JSON.parse(defaultState) : defaultState;
-        state = _prosemirrorState.EditorState.fromJSON(jsonState, stateConf);
-      } catch (e) {}
+        state = _prosemirrorState.EditorState.fromJSON(stateConf, jsonState);
+      } catch (e) {
+        console.log(e);
+      }
     }
 
     var pmEditor = new _prosemirrorView.EditorView(container.current, {
@@ -103,6 +106,20 @@ function RichEditor(_ref, ref) {
       return dataRef.current.editor.destroy();
     };
   }, []);
+  var handleClick = (0, _react.useCallback)(function (e) {
+    var _dataRef$current$edit, _dataRef$current$edit2;
+
+    if (e.target != e.currentTarget) return;
+    var view = (_dataRef$current$edit = dataRef.current.editor) === null || _dataRef$current$edit === void 0 ? void 0 : _dataRef$current$edit.view;
+    if (!view) return;
+    var tr = view.state.tr;
+
+    var selection = _prosemirrorState.TextSelection.atEnd(view.state.doc);
+
+    view.dispatch(tr.setSelection(selection));
+    view.focus();
+    (_dataRef$current$edit2 = dataRef.current.editor) === null || _dataRef$current$edit2 === void 0 ? void 0 : _dataRef$current$edit2.view.focus();
+  }, []);
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       getState: function getState() {
@@ -117,11 +134,7 @@ function RichEditor(_ref, ref) {
       backgroundColor: "#FFF"
     },
     spellCheck: false,
-    onClick: function onClick(e) {
-      var _dataRef$current$edit;
-
-      return (_dataRef$current$edit = dataRef.current.editor) === null || _dataRef$current$edit === void 0 ? void 0 : _dataRef$current$edit.view.focus();
-    }
+    onClick: handleClick
   });
 }
 

package/lib/components/rich-editor/ui/normal-toolbar/index.css

@@ -6,6 +6,7 @@
 .tita-rich-editor-normal-toolbar-item {
   width: 24px;
   height: 24px;
+  margin: 0 2px;
   font-size: 16px;
   display: flex;
   align-items: center;

package/lib/components/rich-editor/utils/mark.js

@@ -156,7 +156,7 @@ var selectionContainsMark = function selectionContainsMark(state, markName) {
     marks = state.storedMarks || $from.marks();
   } else {
     state.doc.nodesBetween(from, to, function (node) {
-      marks.concat(node.marks);
+      marks = marks.concat(node.marks);
     });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.39",
+  "version": "1.10.40",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",