@bigbinary/neeto-rules-frontend 2.5.15-beta-3 → 2.5.15-beta-4

package/dist/NeetoRulesForm.js

@@ -3,7 +3,7 @@ import _objectDestructuringEmpty from '@babel/runtime/helpers/objectDestructurin
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import { shallow } from 'zustand/shallow';
-import { useRef, useEffect, createElement, useState, forwardRef, useMemo, memo, Fragment as Fragment$1 } from 'react';
+import { useRef, useEffect, createElement, forwardRef, useState, useMemo, memo, Fragment as Fragment$1 } from 'react';
 import { useFormikContext, useField, FieldArray, ErrorMessage, Formik, Form as Form$1 } from 'formik';
 import { findBy, isNotEmpty, isPresent, renameKeys, nullSafe, noop, toLabelAndValue, removeBy } from '@bigbinary/neeto-cist';
 import Plus from '@bigbinary/neeto-icons/Plus';
@@ -89,7 +89,7 @@ var useActiveField = function useActiveField(name) {
   useEffect(function () {
     if (!shouldAutoFocus || activeField) return;
     setFieldActive();
-  }, []);
+  }, [name]);
   useEffect(function () {
     var shouldFocus = shouldFocusRef.current;
     shouldFocusRef.current = true;
@@ -104,10 +104,12 @@ var useActiveField = function useActiveField(name) {
     shouldFocusRef.current = !ref.current;
     if (needsRerender) {
       setPanelState(assocPath(["data", "activeField"], null));
+      requestAnimationFrame(function () {
+        return setPanelState(assocPath(["data", "activeField"], name));
+      });
+    } else {
+      setPanelState(assocPath(["data", "activeField"], name));
     }
-    requestAnimationFrame(function () {
-      return setPanelState(assocPath(["data", "activeField"], name));
-    });
   };
   var resetActiveField = function resetActiveField() {
     return setPanelState(assocPath(["data", "activeField"], null));
@@ -947,17 +949,17 @@ var EditorAction = function EditorAction(_ref) {
     editorRef = _ref$editorRef === void 0 ? null : _ref$editorRef,
     defaults = _ref.defaults,
     otherProps = _objectWithoutProperties(_ref, _excluded$d);
-  var _useState = useState(value),
-    _useState2 = _slicedToArray(_useState, 2),
-    editorData = _useState2[0],
-    setEditorData = _useState2[1];
+  var _useStateWithDependen = useStateWithDependency(value, [name]),
+    _useStateWithDependen2 = _slicedToArray(_useStateWithDependen, 2),
+    editorData = _useStateWithDependen2[0],
+    setEditorData = _useStateWithDependen2[1];
   var _useFormikContext = useFormikContext(),
     setFieldValue = _useFormikContext.setFieldValue;
   var debouncedValue = useDebounce(editorData, 200);
   useEffect(function () {
     setFieldValue(name, editorData);
   }, [debouncedValue]);
-  return /*#__PURE__*/jsx(FormikEditor, _objectSpread$n({
+  return /*#__PURE__*/createElement(FormikEditor, _objectSpread$n({
     addons: addons,
     autoFocus: autoFocus,
     defaults: defaults,
@@ -967,6 +969,7 @@ var EditorAction = function EditorAction(_ref) {
     hideSlashCommands: true,
     className: "w-full",
     "data-cy": "neeto-editor",
+    key: name,
     ref: editorRef,
     onChange: setEditorData
   }, otherProps));