ywana-core8 0.0.326 → 0.0.329

package/dist/index.cjs

@@ -159,11 +159,16 @@ var Icon = function Icon(_ref) {
       size = _ref$size === void 0 ? "normal" : _ref$size,
       _ref$clickable = _ref.clickable,
       clickable = _ref$clickable === void 0 ? false : _ref$clickable,
-      action = _ref.action;
+      action = _ref.action,
+      _ref$eventPropagation = _ref.eventPropagation,
+      eventPropagation = _ref$eventPropagation === void 0 ? false : _ref$eventPropagation;
 
   function click(event) {
-    event.stopPropagation();
-    event.preventDefault();
+    if (!eventPropagation) {
+      event.stopPropagation();
+      event.preventDefault();
+    }
+
     if (action) action(event);
   }
 
@@ -2705,7 +2710,11 @@ var UploadArea = function UploadArea(props) {
 
   React.useEffect(function () {
     var resumable = props.resumable;
-    if (resumable && areaElement) resumable.assignDrop(areaElement.current);
+
+    if (resumable && areaElement) {
+      resumable.assignDrop(areaElement.current);
+      resumable.assignBrowse(areaElement.current);
+    }
   }, []);
 
   var onDragOver = function onDragOver() {
@@ -2722,9 +2731,10 @@ var UploadArea = function UploadArea(props) {
     onDragOver: onDragOver,
     onDragLeave: onDragLeave,
     ref: areaElement
-  }, /*#__PURE__*/React__default["default"].createElement(UploadIcon, {
+  }, /*#__PURE__*/React__default["default"].createElement(Icon, {
     icon: icon,
-    resumable: props.resumable
+    clickable: true,
+    eventPropagation: false
   }), /*#__PURE__*/React__default["default"].createElement("label", null, label));
 };
 /**
@@ -2738,8 +2748,8 @@ var UploadIcon = function UploadIcon(_ref) {
   var iconElement = React.useRef();
   React.useEffect(function () {
     if (resumable && iconElement.current) {
-      console.log('UploadIcon.effect', resumable, iconElement.current);
       resumable.assignBrowse(iconElement.current);
+      console.log('uploadicon');
     }
   }, [iconElement]);
   return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -2811,7 +2821,8 @@ var UploadProgress = function UploadProgress(_ref) {
  */
 
 var Uploader = function Uploader(_ref) {
-  var label = _ref.label,
+  var icon = _ref.icon,
+      label = _ref.label,
       target = _ref.target,
       accept = _ref.accept,
       _ref$simultaneousUplo = _ref.simultaneousUploads,
@@ -2884,6 +2895,7 @@ var Uploader = function Uploader(_ref) {
     className: "uploader " + className
   }, state === UPLOAD_STATES.IDLE ? /*#__PURE__*/React__default["default"].createElement(UploadArea, {
     resumable: resumable,
+    icon: icon,
     label: label
   }) : /*#__PURE__*/React__default["default"].createElement(UploadProgress, {
     files: files
@@ -3277,15 +3289,19 @@ var Dialog = function Dialog(props) {
       title = _props$title === void 0 ? "Dialog" : _props$title,
       children = props.children,
       actions = props.actions,
-      className = props.className;
+      className = props.className,
+      _props$eventPropagati = props.eventPropagation,
+      eventPropagation = _props$eventPropagati === void 0 ? false : _props$eventPropagati;
 
   function close() {
     site.closeDialog();
   }
 
   function prevent(e) {
-    e.preventDefault();
-    e.stopPropagation();
+    if (!eventPropagation) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
   }
 
   return /*#__PURE__*/React__default["default"].createElement(React.Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
@@ -3387,7 +3403,8 @@ var UploadDialog = function UploadDialog(_ref) {
     title: title,
     open: true,
     onAction: onAction,
-    actions: actions
+    actions: actions,
+    eventPropagation: true
   }, /*#__PURE__*/React__default["default"].createElement(Uploader, {
     label: label,
     accept: accept,
@@ -6069,6 +6086,7 @@ exports.TreededContentEditor = TreededContentEditor;
 exports.UploadArea = UploadArea;
 exports.UploadDialog = UploadDialog;
 exports.UploadFile = UploadFile;
+exports.UploadIcon = UploadIcon;
 exports.Uploader = Uploader;
 exports.View = View;
 exports.Viewer = Viewer;