diff --git a/packages/blocks/blocksAntd/demo/examples/Drawer.yaml b/packages/blocks/blocksAntd/demo/examples/Drawer.yaml index d034a83d1..596c9756b 100644 --- a/packages/blocks/blocksAntd/demo/examples/Drawer.yaml +++ b/packages/blocks/blocksAntd/demo/examples/Drawer.yaml @@ -45,7 +45,3 @@ type: Drawer properties: keyboard: false -# - id: "properties.open: true" -# type: Drawer -# properties: -# open: true diff --git a/packages/blocks/blocksAntd/src/blocks/Drawer/Drawer.js b/packages/blocks/blocksAntd/src/blocks/Drawer/Drawer.js index 3cb6ace07..f059f03e9 100644 --- a/packages/blocks/blocksAntd/src/blocks/Drawer/Drawer.js +++ b/packages/blocks/blocksAntd/src/blocks/Drawer/Drawer.js @@ -48,7 +48,7 @@ const DrawerBlock = ({ blockId, content, properties, methods, rename, onClose }) mask={properties.mask} maskClosable={properties.maskClosable} title={properties.title} - visible={type.isBoolean(properties.open) ? properties.open : openState} + visible={openState} width={properties.width} height={properties.height} zIndex={properties.zIndex} diff --git a/packages/blocks/blocksAntd/src/blocks/Drawer/Drawer.json b/packages/blocks/blocksAntd/src/blocks/Drawer/Drawer.json index b426498f8..35f75347a 100644 --- a/packages/blocks/blocksAntd/src/blocks/Drawer/Drawer.json +++ b/packages/blocks/blocksAntd/src/blocks/Drawer/Drawer.json @@ -25,11 +25,6 @@ "default": true, "description": "Whether a close (x) button is visible on top right of the Drawer dialog or not." }, - "open": { - "type": "boolean", - "default": false, - "description": "Whether the Drawer dialog is open or not." - }, "mask": { "type": "boolean", "default": true, diff --git a/packages/blocks/blocksAntd/src/blocks/Modal/Modal.js b/packages/blocks/blocksAntd/src/blocks/Modal/Modal.js index ebdf33817..a38a7ddfb 100644 --- a/packages/blocks/blocksAntd/src/blocks/Modal/Modal.js +++ b/packages/blocks/blocksAntd/src/blocks/Modal/Modal.js @@ -52,7 +52,7 @@ const ModalBlock = ({ blockId, content, properties, events, methods }) => { id={`${blockId}_modal`} title={properties.title} bodyStyle={methods.makeCssClass(properties.bodyStyle, { styleObjectOnly: true })} - visible={type.isBoolean(properties.open) ? properties.open : openState} + visible={openState} onOk={async () => { await methods.triggerEvent({ name: 'onOk' }); // the visible should only close if actions finished successfully diff --git a/packages/blocks/blocksAntd/src/blocks/Modal/Modal.json b/packages/blocks/blocksAntd/src/blocks/Modal/Modal.json index 2a5264cc1..7c588bea9 100644 --- a/packages/blocks/blocksAntd/src/blocks/Modal/Modal.json +++ b/packages/blocks/blocksAntd/src/blocks/Modal/Modal.json @@ -63,11 +63,6 @@ "default": true, "description": "Whether to close the modal dialog when the mask (area outside the modal) is clicked." }, - "open": { - "type": "boolean", - "default": false, - "description": "Set the modal as open or closed using a property instead of actions." - }, "okText": { "type": "string", "default": "Ok",