@bigbinary/neeto-form-frontend 2.2.0-beta2 → 2.2.0-beta3

package/dist/index.js

@@ -21,7 +21,7 @@ import ActionBlock from '@bigbinary/neetoui/formik/ActionBlock';
 import { useTranslation, Trans, I18nextProvider } from 'react-i18next';
 import { create } from 'zustand';
 import '@babel/runtime/helpers/typeof';
-import { isEditorEmpty, Editor as Editor$1, EditorContent } from '@bigbinary/neeto-editor';
+import { isEditorEmpty } from '@bigbinary/neeto-editor/utils';
 import { shallow } from 'zustand/shallow';
 import Alert from '@bigbinary/neetoui/Alert';
 import DOMPurify from 'dompurify';
@@ -33,6 +33,7 @@ import Pane from '@bigbinary/neetoui/Pane';
 import Form$2 from '@bigbinary/neetoui/formik/Form';
 import Select from '@bigbinary/neetoui/formik/Select';
 import Textarea from '@bigbinary/neetoui/formik/Textarea';
+import NeetoEditor from '@bigbinary/neeto-editor/Editor';
 import Switch from '@bigbinary/neetoui/formik/Switch';
 import Button$1 from '@bigbinary/neetoui/Button';
 import Accordion from '@bigbinary/neetoui/Accordion';
@@ -49,6 +50,7 @@ import Toastr from '@bigbinary/neetoui/Toastr';
 import Spinner$2 from '@bigbinary/neetoui/Spinner';
 import dayjs from 'dayjs';
 import { parsePhoneNumber } from 'libphonenumber-js';
+import EditorContent from '@bigbinary/neeto-editor/EditorContent';
 import NeetoUIMultiEmailInput from '@bigbinary/neetoui/MultiEmailInput';
 import { validation, PhoneNumberInput, PhoneNumber } from '@bigbinary/neeto-molecules/PhoneNumber';
 import localeData from 'dayjs/plugin/localeData';
@@ -555,10 +557,10 @@ var handleQuestionMutationSuccess = function handleQuestionMutationSuccess(_ref)
   var _args = _slicedToArray$2(args, 1),
     data = _args[0];
   queryClient.invalidateQueries({
-    queryKey: [QUERY_KEYS.QUESTIONS, formId, language]
+    queryKey: [QUERY_KEYS.QUESTIONS, formId]
   });
   queryClient.invalidateQueries({
-    queryKey: [QUERY_KEYS.QUESTIONS, "preview/".concat(formId), language]
+    queryKey: [QUERY_KEYS.QUESTIONS, "preview/".concat(formId)]
   });
   queryClient.setQueryData([QUERY_KEYS.QUESTIONS, formId, language], assoc("questions", data.questions));
   queryClient.setQueryData([QUERY_KEYS.QUESTIONS, "preview/".concat(formId), language], assoc("questions", data.questions));
@@ -882,8 +884,17 @@ var DEFAULT_AVAILABLE_LANGUAGES = [{
 var QUESTIONS_WITHOUT_FIELD_CODE = [PARAGRAPH$1, TERMS_AND_CONDITION$1, CONDITION$1, FILE_UPLOAD$3];
 var QUESTIONS_INITIAL_VALUE = {
   enabled: false,
-  questions: [],
-  title: ""
+  questions: [{
+    label: "",
+    kind: "text",
+    nodeId: "1"
+  }, {
+    label: "",
+    kind: "email",
+    nodeId: "2"
+  }],
+  title: "",
+  isQuestionsLoading: true
 };
 var RESERVED_FIELD_CODES = ["month", "date", "time"];
 var SELECTABLE_KINDS = [RADIO$2, CHECKBOX$2, DROPDOWN$2];
@@ -2025,7 +2036,7 @@ var Editor = function Editor() {
   });
   return /*#__PURE__*/jsx("div", {
     className: "w-full cursor-auto",
-    children: /*#__PURE__*/jsx(Editor$1, {
+    children: /*#__PURE__*/jsx(NeetoEditor, {
       required: true,
       error: touched ? error : "",
       id: "editor",
@@ -3116,22 +3127,11 @@ var BuildForm = function BuildForm(_ref) {
     isReordering = _useReorderQuestions.isPending;
   var _useFetchQuestions = useFetchQuestions({
       formId: id,
-      language: selectedLanguage,
-      placeholderData: {
-        isQuestionsLoading: true,
-        questions: [{
-          label: "",
-          kind: "text",
-          nodeId: "1"
-        }, {
-          label: "",
-          kind: "email",
-          nodeId: "2"
-        }]
-      }
+      language: selectedLanguage
     }),
     data = _useFetchQuestions.data,
-    isLoading = _useFetchQuestions.isLoading;
+    isLoading = _useFetchQuestions.isLoading,
+    isQuestionsPending = _useFetchQuestions.isPending;
   var _ref2 = data || QUESTIONS_INITIAL_VALUE,
     isFormEnabled = _ref2.enabled,
     savedTitle = _ref2.title,
@@ -3142,7 +3142,7 @@ var BuildForm = function BuildForm(_ref) {
       onUpdate === null || onUpdate === void 0 || onUpdate(data);
     }
   }, [data]);
-  if (isLoading || showLoader && isQuestionsLoading) {
+  if (isLoading || showLoader && isQuestionsLoading && !isQuestionsPending) {
     return /*#__PURE__*/jsx("div", {
       className: "flex h-full w-full items-center justify-center py-6",
       children: /*#__PURE__*/jsx(PageLoader, {})
@@ -3226,7 +3226,7 @@ var BuildForm = function BuildForm(_ref) {
           }
         }));
       }
-    }), isQuestionsLoading && /*#__PURE__*/jsx("div", {
+    }), isQuestionsLoading && !isQuestionsPending && /*#__PURE__*/jsx("div", {
       className: "neeto-ui-bg-white absolute inset-0 flex items-center justify-center",
       children: /*#__PURE__*/jsx(PageLoader, {})
     })]
@@ -13758,7 +13758,7 @@ var RichTextEditor = function RichTextEditor(_ref) {
         var field = _ref2.field,
           form = _ref2.form,
           meta = _ref2.meta;
-        return /*#__PURE__*/jsx(Editor$1, _objectSpread$8({
+        return /*#__PURE__*/jsx(NeetoEditor, _objectSpread$8({
           className: "neeto-form-engine-rich-text-input",
           error: meta.touched ? meta.error : "",
           initialValue: field.value,
@@ -14317,15 +14317,13 @@ var ExternalForm = function ExternalForm(_ref) {
   var _useForm = useForm({
       formId: formId,
       language: language,
-      enabled: !preview,
-      placeholderData: {
-        isQuestionsLoading: true
-      }
+      enabled: !preview
     }),
     _useForm$data = _useForm.data,
     form = _useForm$data === void 0 ? {
       title: "",
-      questions: []
+      questions: [],
+      isQuestionsLoading: true
     } : _useForm$data,
     isLoading = _useForm.isLoading;
   var _queryClient$getQuery = queryClient.getQueryState([QUERY_KEYS.QUESTIONS, formId, language]),