fix(blocksAntd): Pass icons to confirm modal, closes #1160

lowdefy · Apr 7, 2022 · 2256b2b · 2256b2b
1 parent 07286df
commit 2256b2b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/packages/blocks/blocksAntd/src/blocks/ConfirmModal/ConfirmModal.js b/packages/blocks/blocksAntd/src/blocks/ConfirmModal/ConfirmModal.js
@@ -37,8 +37,32 @@ const ConfirmModal = ({ blockId, events, content, methods, properties }) => {
           renderHtml({ html: properties.content, methods }),
         className: methods.makeCssClass(properties.modalStyle),
         okText: properties.okText || 'Ok',
-        okButtonProps: properties.okButton,
-        cancelButtonProps: properties.cancelButton,
+        okButtonProps:
+          properties.okButton && properties.okButton.icon
+            ? {
+                ...properties.okButton,
+                icon: properties.icon && (
+                  <Icon
+                    blockId={`${blockId}_ok_icon`}
+                    events={events}
+                    properties={properties.okButton.icon}
+                  />
+                ),
+              }
+            : properties.okButton,
+        cancelButtonProps:
+          properties.cancelButtonProps && properties.cancelButtonProps.icon
+            ? {
+                ...properties.cancelButtonProps,
+                icon: properties.icon && (
+                  <Icon
+                    blockId={`${blockId}_ok_icon`}
+                    events={events}
+                    properties={properties.cancelButtonProps.icon}
+                  />
+                ),
+              }
+            : properties.cancelButtonProps,
         cancelText: properties.cancelText || 'Cancel',
         centered: properties.centered || false,
         mask: properties.mask !== undefined ? properties.mask : true,

diff --git a/packages/docs/templates/blocks/propertiesFormTransformer.js b/packages/docs/templates/blocks/propertiesFormTransformer.js
@@ -88,7 +88,7 @@ const button = (path) => ({
   },
   properties: {
     size: 'small',
-    title: 'button:',
+    title: `${path}:`,
     inner: true,
   },
   blocks: [