ywana-core8 0.0.417 → 0.0.418

package/dist/index.modern.js

@@ -1,5 +1,5 @@
 import 'material-design-icons-iconfont/dist/material-design-icons.css';
-import React, { useContext, useState, useEffect, Fragment, useRef, useMemo, Children } from 'react';
+import React, { useContext, useState, useEffect, Fragment, useMemo, useRef, Children } from 'react';
 import RSwitch from 'react-switch';
 import moment from 'moment';
 import { extendMoment } from 'moment-range';
@@ -1890,37 +1890,22 @@ var StringCellEditor = function StringCellEditor(_ref8) {
 var TokenField = function TokenField(_ref) {
   var id = _ref.id,
       label = _ref.label,
-      _ref$init = _ref.init,
-      init = _ref$init === void 0 ? [] : _ref$init,
+      _ref$tokens = _ref.tokens,
+      tokens = _ref$tokens === void 0 ? [] : _ref$tokens,
       readOnly = _ref.readOnly,
       options = _ref.options,
       onChange = _ref.onChange;
-  var mounted = useRef(false);
 
   var _useState = useState(),
       value = _useState[0],
       setValue = _useState[1];
 
-  var _useState2 = useState(init),
-      tokens = _useState2[0],
-      setTokens = _useState2[1];
-
   useState(false);
 
-  useEffect(function () {
-    if (mounted.current) {
-      if (onChange) {
-        if (tokens) onChange(id, tokens);
-      }
-    } else {
-      mounted.current = true;
-    }
-  }, [tokens]);
-
   function remove(index) {
     var next = tokens.slice();
     next.splice(index, 1);
-    setTokens(next);
+    if (onChange) onChange(id, next);
   }
 
   function change(event) {
@@ -1928,10 +1913,10 @@ var TokenField = function TokenField(_ref) {
     setValue(value);
   }
 
-  function changeDropDown(id, value) {
+  function changeDropDown(fid, value) {
     var next = tokens.concat(value);
-    setTokens(next);
-    setValue('xxx');
+    if (onChange) onChange(id, next);
+    setValue('');
   }
 
   function onEnter(event) {
@@ -1940,7 +1925,7 @@ var TokenField = function TokenField(_ref) {
       event.stopPropagation();
       var token = event.target.value;
       var next = tokens.concat(token);
-      setTokens(next);
+      if (onChange) onChange(id, next);
       setValue('');
     }
 
@@ -4110,6 +4095,7 @@ var StringEditor = function StringEditor(_ref6) {
       Editor = field.Editor;
 
   function change(id, value) {
+    console.log(id, value);
     if (onChange) onChange(id, value);
   }
 
@@ -4147,14 +4133,12 @@ var StringEditor = function StringEditor(_ref6) {
         });
 
       case FORMATS.TOKENS:
-        var init = Array.isArray(value) ? value : [];
         return /*#__PURE__*/React.createElement(TokenField, {
           id: id,
           label: label,
           onChange: change,
-          readOnly: !editable,
           options: buildOptions(),
-          init: init
+          tokens: value
         });
 
       default: