ywana-core8 0.0.16 → 0.0.17

package/dist/index.cjs

@@ -3137,13 +3137,13 @@ var CollectionAdder = function CollectionAdder(_ref11) {
 var CreateContentDialog = function CreateContentDialog(_ref) {
   var label = _ref.label,
       type = _ref.type,
+      _ref$value = _ref.value,
+      value = _ref$value === void 0 ? {} : _ref$value,
       validator = _ref.validator,
-      onOK = _ref.onOK,
-      _ref$onActionClose = _ref.onActionClose,
-      onActionClose = _ref$onActionClose === void 0 ? true : _ref$onActionClose;
+      onOK = _ref.onOK;
   var site = React.useContext(SiteContext);
 
-  var _useState = React.useState({}),
+  var _useState = React.useState(value),
       form = _useState[0],
       setForm = _useState[1];
 
@@ -3155,7 +3155,7 @@ var CreateContentDialog = function CreateContentDialog(_ref) {
       errors = _useState3[0],
       setErrors = _useState3[1];
 
-  function change(form, validForm) {
+  function change(form) {
     setForm(form);
 
     if (validator) {
@@ -3164,28 +3164,20 @@ var CreateContentDialog = function CreateContentDialog(_ref) {
           _validator$errors = _validator.errors,
           _errors = _validator$errors === void 0 ? [] : _validator$errors;
 
-      setValid(validForm && validation);
+      setValid(validation);
       setErrors(_errors);
     } else {
-      setValid(validForm);
+      setValid(true);
     }
   }
 
   function onAction(action) {
-    if (action === 'OK' && onOK) onOK(form);
-    if (action === 'CLOSE' || onActionClose === true) site.closeDialog();
-  }
-
-  function isRequired(field) {
-    var _field$required = field.required,
-        required = _field$required === void 0 ? false : _field$required;
-    return required;
+    if (action === 'OK' && onOK) onOK(Object.assign({}, value, form));
+    site.closeDialog();
   }
 
-  function isOptional(field) {
-    var _field$creation = field.creation,
-        creation = _field$creation === void 0 ? false : _field$creation;
-    return creation;
+  function createFilter(field, content) {
+    return field.required === true || field.optional === true; // TODO: execute props.filter
   }
 
   var actions = /*#__PURE__*/React__default["default"].createElement(React.Fragment, null, /*#__PURE__*/React__default["default"].createElement(Button, {
@@ -3193,6 +3185,8 @@ var CreateContentDialog = function CreateContentDialog(_ref) {
     action: function action() {
       return onAction("CLOSE");
     }
+  }), /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "expand"
   }), /*#__PURE__*/React__default["default"].createElement(Button, {
     label: "OK",
     action: function action() {
@@ -3210,12 +3204,10 @@ var CreateContentDialog = function CreateContentDialog(_ref) {
     open: true,
     onAction: onAction,
     actions: actions
-  }, /*#__PURE__*/React__default["default"].createElement(ContentForm, {
+  }, /*#__PURE__*/React__default["default"].createElement(ContentEditor, {
     content: content,
-    filter: function filter(field) {
-      return isRequired(field) || isOptional(field);
-    },
-    onChange: change
+    onChange: change,
+    filter: createFilter
   }), errors.map(function (error) {
     return /*#__PURE__*/React__default["default"].createElement(Text, {
       use: "overline",