fix(blocks-antd): Fix confirm modal button icons, closes #1160

lowdefy · Apr 7, 2022 · bba35be · bba35be
1 parent ec8d5ca
commit bba35be
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/packages/docs/templates/blocks/propertiesFormTransformer.js b/packages/docs/templates/blocks/propertiesFormTransformer.js
@@ -70,7 +70,7 @@ const button = (path) => ({
   },
   properties: {
     size: 'small',
-    title: 'button:',
+    title: `${path}:`,
     inner: true,
   },
   blocks: [

diff --git a/packages/plugins/blocks/blocks-antd/src/blocks/ConfirmModal/ConfirmModal.js b/packages/plugins/blocks/blocks-antd/src/blocks/ConfirmModal/ConfirmModal.js
@@ -38,8 +38,32 @@ const ConfirmModal = ({ blockId, events, content, components: { Icon }, methods,
         className: methods.makeCssClass(properties.modalStyle),
         closable: properties.closable,
         okText: properties.okText || 'Ok',
-        okButtonProps: properties.okButton,
-        cancelButtonProps: properties.cancelButton,
+        okButtonProps:
+          properties.okButton && properties.okButton.icon
+            ? {
+                ...properties.okButton,
+                icon: properties.okButton.icon && (
+                  <Icon
+                    blockId={`${blockId}_ok_icon`}
+                    events={events}
+                    properties={properties.okButton.icon}
+                  />
+                ),
+              }
+            : properties.okButton,
+        cancelButtonProps:
+          properties.cancelButton && properties.cancelButton.icon
+            ? {
+                ...properties.cancelButton,
+                icon: properties.cancelButton.icon && (
+                  <Icon
+                    blockId={`${blockId}_ok_icon`}
+                    events={events}
+                    properties={properties.cancelButton.icon}
+                  />
+                ),
+              }
+            : properties.cancelButton,
         cancelText: properties.cancelText || 'Cancel',
         centered: properties.centered || false,
         mask: properties.mask !== undefined ? properties.mask : true,