@startlibs/form 1.0.6 → 1.0.8

package/lib/index.js

@@ -952,6 +952,7 @@ var ConfirmDialog = function ConfirmDialog(_ref2) {
       skipDom = _ref2.skipDom,
       className = _ref2.className,
       closeDialog = _ref2.closeDialog,
+      onClose = _ref2.onClose,
       skipCloseIcon = _ref2.skipCloseIcon,
       _ref2$cancelLabel = _ref2.cancelLabel,
       cancelLabel = _ref2$cancelLabel === void 0 ? "Cancelar" : _ref2$cancelLabel,
@@ -984,6 +985,33 @@ var ConfirmDialog = function ConfirmDialog(_ref2) {
       skipErrors = _ref2.skipErrors,
       hidden = _ref2.hidden,
       skipCheckFocus = _ref2.skipCheckFocus;
+  var handleClose = React.useCallback(
+  /*#__PURE__*/
+  _asyncToGenerator(
+  /*#__PURE__*/
+  _regeneratorRuntime.mark(function _callee() {
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (!onClose) {
+              _context.next = 3;
+              break;
+            }
+
+            _context.next = 3;
+            return onClose().catch(console.error);
+
+          case 3:
+            if (closeDialog) closeDialog();
+
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, this);
+  })), [onClose, closeDialog]);
   return React.createElement(WithForm$1, {
     alwaysSave: alwaysSave,
     ref: formRef,
@@ -1002,7 +1030,7 @@ var ConfirmDialog = function ConfirmDialog(_ref2) {
 
       return Promise.resolve(callIfFunction.apply(void 0, [_onSuccess].concat(props))).then(function (v) {
         if (!keepOnSuccess) {
-          closeDialog();
+          handleClose();
         }
 
         if (notify) {
@@ -1020,15 +1048,15 @@ var ConfirmDialog = function ConfirmDialog(_ref2) {
       skipCloseIcon: skipCloseIcon,
       confirmChanges: confirmChanges,
       isLoading: isLoading,
-      closeDialog: closeDialog,
+      closeDialog: handleClose,
       form: form,
       stickyFooter: stickyFooter,
       auxiliarActions: auxiliarActions,
       fullscreen: fullscreen,
       fullscreenOnMobile: fullscreenOnMobile,
-      footer: (cancelButton || alternativeButton || confirm) && React.createElement(React.Fragment, null, cancelButton && addExtraProp(callIfFunction(cancelButton, closeDialog), {
-        onClick: closeDialog
-      }, false), callIfFunction(alternativeButton, closeDialog), confirm && using(callIfFunction(confirm, {
+      footer: (cancelButton || alternativeButton || confirm) && React.createElement(React.Fragment, null, cancelButton && addExtraProp(callIfFunction(cancelButton, handleClose), {
+        onClick: handleClose
+      }, false), callIfFunction(alternativeButton, handleClose), confirm && using(callIfFunction(confirm, {
         form: form,
         isLoading: isLoading
       }))(function (c) {
@@ -3544,7 +3572,7 @@ function (_React$Component) {
     };
 
     _this.onChange = function (evt) {
-      _this.props.onChange(_this.props.index, cleanText(evt.target.value));
+      _this.props.onChange(_this.props.index, cleanText(evt.currentTarget.isContentEditable ? evt.currentTarget.innerText : evt.target.value));
     };
 
     _this.onPaste = function (ev) {
@@ -3614,7 +3642,7 @@ function (_React$Component) {
         onPaste: this.onPaste,
         value: value,
         index: index,
-        html: valueOrBlank.replace(/\s/, ' ')
+        html: valueOrBlank.replace(/\s$/, ' ')
       }, rest, {
         onChange: this.onChange
       });
@@ -5893,45 +5921,6 @@ var cleanEditor = function cleanEditor(editor, acceptedTags) {
   clean(editor.childNodes);
 };
 
-var insertToken = function insertToken(node, offset) {
-  var parent = node.parentNode;
-  var token = document.createElement("span");
-
-  if (node.nodeType === Node.TEXT_NODE) {
-    var splitted = node.splitText(offset);
-    parent.insertBefore(token, splitted);
-  } else {
-    parent.insertBefore(token, node);
-  }
-
-  return token;
-};
-/*
-* pagely reformat
- .replace(/^[a-z]/, function (e) {
-      return e.toUpperCase()
-    })
-* */
-
-
-var parseAndExecCommand = function parseAndExecCommand(c) {
-  if (c === "strikethrough" || c === "underline") {
-    document.execCommand('styleWithCSS', false, false);
-  } else {
-    document.execCommand('styleWithCSS', false, true);
-  }
-
-  if (c.indexOf('fontSize') === 0) {
-    var direction = c.indexOf('Up') > 0 ? 1 : -1;
-    var newValue = Math.min(7, Math.max(1, parseInt(document.queryCommandValue('fontSize') || 3) + direction));
-    document.execCommand('fontSize', false, newValue);
-  } else {
-    var sanitizedCommand = c.indexOf("List") >= 0 && document.queryCommandState(c) ? 'outdent' : c; // FIX CHROME HANGS when list is called and already active
-
-    document.execCommand(sanitizedCommand);
-  }
-};
-
 var RichText = function RichText(_ref5) {
   var path = _ref5.path,
       inputRef = _ref5.inputRef,
@@ -5989,7 +5978,7 @@ var RichText = function RichText(_ref5) {
 
   useEffect(function () {
     if (value === formValue && formValue !== tempValue) {
-      setTempValue(formValue);
+      tempValue.current = formValue;
     }
   }, [path]);
 
@@ -6138,63 +6127,11 @@ var RichText = function RichText(_ref5) {
         sel.addRange(_range);
       }
 
-      if (window.getSelection().rangeCount) {
-        commands.set(window.getSelection().getRangeAt(0).collapsed ? commands.get().concat(command) : [command]);
-
-        if (window.getSelection().getRangeAt(0).startContainer === input.current) {
-          // firefox ctrl+a bug
-          startSelectionToken.set(insertToken(input.current.firstChild, 0));
-          endSelectionToken.set(insertToken(input.current.lastChild, input.current.lastChild.length));
-        } else {
-          // ORDER MATTERS HERE splitText creates new text on the right https://developer.mozilla.org/en-US/docs/Web/API/Text/splitText
-          endSelectionToken.set(insertToken(window.getSelection().getRangeAt(0).endContainer, window.getSelection().getRangeAt(0).endOffset));
-          startSelectionToken.set(insertToken(window.getSelection().getRangeAt(0).startContainer, window.getSelection().getRangeAt(0).startOffset));
-        }
-      }
-
-      containerFocused.openWith(1);
+      document.execCommand(command);
+      setFormValue(input.current.innerHTML);
+      toggleButtonsState();
       focus();
     }
-
-    if (command === 'insertUnorderedList' || command === 'insertOrderedList') {
-      var _range2 = document.createRange();
-
-      _range2.setStart(startSelectionToken.get().nextSibling, 0);
-
-      var _end = endSelectionToken.get().nextSibling;
-      startSelectionToken.get().remove();
-      endSelectionToken.get().remove();
-      startSelectionToken.set(null);
-      endSelectionToken.set(null);
-
-      _range2.setEnd(_end, 0);
-    }
-  };
-
-  var execCommandMouseUp = function execCommandMouseUp() {
-    if (startSelectionToken.get()) {
-      // window.getSelection().removeAllRanges()
-      var range = document.createRange();
-      range.setStart(startSelectionToken.get().nextSibling, 0);
-      var end = endSelectionToken.get().nextSibling;
-      startSelectionToken.get().remove();
-      endSelectionToken.get().remove();
-      startSelectionToken.set(null);
-      endSelectionToken.set(null);
-      range.setEnd(end, 0);
-      window.getSelection().addRange(range);
-    } else {
-      input.current.focus();
-    }
-
-    commands.get().forEach(function (c) {
-      return parseAndExecCommand(c);
-    }); // commands.set(_.without(['insertUnorderedList','insertOrderedList','outdent','indent']))
-
-    commands.set([]);
-    setFormValue(input.current.innerHTML);
-    containerFocused.openWith(2);
-    toggleButtonsState();
   };
 
   var isSelectionInsideRichTextEditor = function isSelectionInsideRichTextEditor() {
@@ -6249,7 +6186,6 @@ var RichText = function RichText(_ref5) {
 
   var handleKeyUp = function handleKeyUp(e) {
     toggleButtonsState();
-    commands.set([]);
     setFormValue(reformatText(input.current.innerHTML));
   };
 
@@ -6328,12 +6264,9 @@ var RichText = function RichText(_ref5) {
     return React.createElement(ToolButton, {
       key: tool,
       tabIndex: -1,
-      onMouseDown: function onMouseDown(e) {
+      onClick: function onClick(e) {
         return execCommand(e, tool);
       },
-      onMouseUp: function onMouseUp(e) {
-        return execCommandMouseUp();
-      },
       className: 'button exec-command rich-text-button only-icon ' + (activatedTools[tool] ? 'activated' : ''),
       type: "button"
     }, React.createElement("span", {
@@ -6344,7 +6277,6 @@ var RichText = function RichText(_ref5) {
   var richTextElement = React.createElement(RichTextContainer, {
     linkColor: linkColor,
     ref: container,
-    onClick: stopPropagation(),
     onFocus: containerFocus,
     onBlur: containerBlur,
     focus: containerFocused.isOpen,
@@ -6357,11 +6289,10 @@ var RichText = function RichText(_ref5) {
       className: "separator",
       key: "separator-" + i
     }) : toolButton(t);
-  })), React.createElement(RichTextInput, {
-    className: JS_CLASS
-  }, React.createElement(ContentEditable, {
+  })), React.createElement(RichTextInput, null, React.createElement(ContentEditable, {
+    className: JS_CLASS,
     innerRef: input,
-    html: tempValue.current,
+    html: tempValue.current || "",
     onBlur: onBlur,
     onClick: handleClick,
     onKeyUp: handleKeyUp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startlibs/form",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Startlibs Form",
   "main": "lib/index.js",
   "sideEffects": false,