ywana-core8 0.0.618 → 0.0.621

package/dist/index.cjs

@@ -308,40 +308,6 @@ var AccordionSection = function AccordionSection(props) {
   })), open ? /*#__PURE__*/React__default["default"].createElement("main", null, children) : '');
 };
 
-/**
- * HTML Button
- */
-
-var Button = function Button(_ref) {
-  var label = _ref.label,
-      icon = _ref.icon,
-      action = _ref.action,
-      _ref$disabled = _ref.disabled,
-      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-      outlined = _ref.outlined,
-      raised = _ref.raised;
-
-  function click(event) {
-    if (!disabled) {
-      event.stopPropagation();
-      event.preventDefault();
-      if (action) action();
-    }
-  }
-
-  var style = raised ? 'raised' : outlined ? 'outlined' : 'normal';
-  if (disabled) style = style + " disabled";
-  return /*#__PURE__*/React__default["default"].createElement("button", {
-    className: "btn " + style,
-    onClick: click
-  }, icon ? /*#__PURE__*/React__default["default"].createElement(Icon, {
-    icon: icon,
-    size: "small",
-    clickable: true,
-    action: click
-  }) : null, /*#__PURE__*/React__default["default"].createElement("span", null, label));
-};
-
 /**
  * Site Context
  */
@@ -390,6 +356,40 @@ var Text = function Text(_ref) {
   }, value) : '';
 };
 
+/**
+ * HTML Button
+ */
+
+var Button = function Button(_ref) {
+  var label = _ref.label,
+      icon = _ref.icon,
+      action = _ref.action,
+      _ref$disabled = _ref.disabled,
+      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+      outlined = _ref.outlined,
+      raised = _ref.raised;
+
+  function click(event) {
+    if (!disabled) {
+      event.stopPropagation();
+      event.preventDefault();
+      if (action) action();
+    }
+  }
+
+  var style = raised ? 'raised' : outlined ? 'outlined' : 'normal';
+  if (disabled) style = style + " disabled";
+  return /*#__PURE__*/React__default["default"].createElement("button", {
+    className: "btn " + style,
+    onClick: click
+  }, icon ? /*#__PURE__*/React__default["default"].createElement(Icon, {
+    icon: icon,
+    size: "small",
+    clickable: true,
+    action: click
+  }) : null, /*#__PURE__*/React__default["default"].createElement(Text, null, label));
+};
+
 /**
  * CheckBox
  */
@@ -5947,7 +5947,6 @@ var CollectionTree = function CollectionTree(props) {
   }
 
   function group(items, by) {
-    console.log(schema, items, by);
     var options = schema[by] ? schema[by].options : null;
     return items.reduce(function (nodes, field) {
       var node = nodes.find(function (n) {
@@ -5955,13 +5954,21 @@ var CollectionTree = function CollectionTree(props) {
       });
 
       if (!node) {
-        var name = options ? options.find(function (option) {
-          return option.value === field[by];
-        }) : field[by];
+        var name = field[by];
+        var title = field[by];
+
+        if (options) {
+          var opt = options.find(function (option) {
+            return option.value === field[by];
+          });
+          if (opt) title = opt.label;
+        }
+
         node = {
           name: name,
           items: [],
-          field: by
+          field: by,
+          title: title
         };
         nodes.push(node);
       }
@@ -5982,7 +5989,7 @@ var CollectionTree = function CollectionTree(props) {
 
   function renderNodes(nodes) {
     return nodes.map(function (node) {
-      var title = typeof node.name === 'boolean' ? node.field + " = " + node.name : node.name;
+      var title = typeof node.name === 'boolean' ? node.field + " = " + node.name : node.title;
       return /*#__PURE__*/React__default["default"].createElement(TreeNode, {
         key: node.name,
         icon: null,