From 86a4df42afdc7bb5e938fe379c720eed1f1985f7 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Mon, 1 Nov 2021 17:08:13 -0300 Subject: [PATCH 01/18] First experiments with block Transformation. #628 --- .../blocks/items-list/index.js | 4 +- .../blocks/items-list/transforms.js | 60 +++++++++++++++++++ .../js/tainacan-blocks-compat-register.js | 8 ++- 3 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 src/views/gutenberg-blocks/blocks/items-list/transforms.js diff --git a/src/views/gutenberg-blocks/blocks/items-list/index.js b/src/views/gutenberg-blocks/blocks/items-list/index.js index 956c07742..39540ea88 100644 --- a/src/views/gutenberg-blocks/blocks/items-list/index.js +++ b/src/views/gutenberg-blocks/blocks/items-list/index.js @@ -5,11 +5,13 @@ import icon from './icon.js'; import edit from './edit.js'; import save from './save.js'; import deprecated from './deprecated.js'; +import transforms from './transforms.js'; tainacanRegisterBlockType({ metadata, icon, edit, save, - deprecated + deprecated, + transforms }); diff --git a/src/views/gutenberg-blocks/blocks/items-list/transforms.js b/src/views/gutenberg-blocks/blocks/items-list/transforms.js new file mode 100644 index 000000000..79aeaab51 --- /dev/null +++ b/src/views/gutenberg-blocks/blocks/items-list/transforms.js @@ -0,0 +1,60 @@ +const { createBlock } = wp.blocks; + +export default { + to: [ + { + type: 'block', + blocks: [ 'tainacan/dynamic-items-list' ], + transform: ( { + selectedItemsObject, + selectedItemsHTML, + content, + collectionId, + showImage, + showName, + layout, + gridMargin + } ) => { + return createBlock( + 'tainacan/dynamic-items-list', + { + items: selectedItemsHTML, + content: content, + collection: {}, + collectionId: collectionId, + showImage: showImage, + showName: showName, + layout: layout, + isModalOpen: false, + gridMargin: gridMargin, + searchURL: '', + itemsRequestSource: '', + maxItemsNumber: 12, + order: '', + searchString: '', + selectedItems: selectedItemsObject, + isLoading: false, + loadStrategy: 'selection', + showSearchBar: false, + showCollectionHeader: false, + showCollectionLabel: true, + isLoadingCollection: false, + collectionBackgroundColor: '#454647', + collectionTextColor: '#ffffff', + mosaicHeight: 280, + mosaicGridColumns: 3, + mosaicGridRows: 3, + mosaicItemFocalPoint: { + x: 0.5, + y: 0.5 + }, + sampleBackgroundImage: '', + mosaicDensity: 6, + maxColumnsCount: 4, + cropImagesToSquare: true + } + ); + }, + }, + ] +}; \ No newline at end of file diff --git a/src/views/gutenberg-blocks/js/tainacan-blocks-compat-register.js b/src/views/gutenberg-blocks/js/tainacan-blocks-compat-register.js index 71849ac8b..b69bed666 100644 --- a/src/views/gutenberg-blocks/js/tainacan-blocks-compat-register.js +++ b/src/views/gutenberg-blocks/js/tainacan-blocks-compat-register.js @@ -21,7 +21,7 @@ function tainacanBlocksLocalizeMetadata(metadata) { } // Register the block type according to WP version -export default function({ metadata, icon, edit, save, deprecated }) { +export default function({ metadata, icon, edit, save, deprecated, transforms }) { const currentWPVersion = (typeof tainacan_blocks != 'undefined') ? tainacan_blocks.wp_version : tainacan_plugin.wp_version; if (currentWPVersion >= '5.8-RC') { @@ -34,7 +34,8 @@ export default function({ metadata, icon, edit, save, deprecated }) { }, edit, save, - deprecated + deprecated, + transforms }); } else { @@ -48,7 +49,8 @@ export default function({ metadata, icon, edit, save, deprecated }) { }, edit, save, - deprecated + deprecated, + transforms }); } }; \ No newline at end of file From 71564871d7ac80697a4a06ef60598124b0b395eb Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Wed, 3 Nov 2021 10:51:43 -0300 Subject: [PATCH 02/18] Allows transforming items list to carousel items list. --- .../blocks/items-list/transforms.js | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/src/views/gutenberg-blocks/blocks/items-list/transforms.js b/src/views/gutenberg-blocks/blocks/items-list/transforms.js index 79aeaab51..36d7aff2e 100644 --- a/src/views/gutenberg-blocks/blocks/items-list/transforms.js +++ b/src/views/gutenberg-blocks/blocks/items-list/transforms.js @@ -32,7 +32,7 @@ export default { maxItemsNumber: 12, order: '', searchString: '', - selectedItems: selectedItemsObject, + selectedItems: selectedItemsObject.map((anItemObject) => anItemObject.id.split('item-id-')[1]), isLoading: false, loadStrategy: 'selection', showSearchBar: false, @@ -56,5 +56,51 @@ export default { ); }, }, + { + type: 'block', + blocks: [ 'tainacan/carousel-items-list' ], + transform: ( { + selectedItemsObject, + selectedItemsHTML, + content, + collectionId, + showName, + gridMargin + } ) => { + return createBlock( + 'tainacan/carousel-items-list', + { + items: selectedItemsHTML, + content:
, + collection: {}, + collectionId: collectionId, + hideTitle: !showName, + isModalOpen: false, + gridMargin: gridMargin, + searchURL: '', + itemsRequestSource: '', + maxItemsNumber: 12, + maxItemsPerScreen: 4, + selectedItems: selectedItemsObject.map((anItemObject) => anItemObject.id.split('item-id-')[1]), + isLoading: false, + loadStrategy: 'selection', + arrowsPosition : 'around', + spaceBetweenItems: 32, + spaceAroundCarousel: 50, + largeArrows: false, + arrowsStyle : 'type-1', + autoPlay: false, + autoPlaySpeed: 3, + loopSlides: false, + showCollectionHeader: false, + showCollectionLabel: true, + isLoadingCollection: false, + collectionBackgroundColor: '#454647', + collectionTextColor: '#ffffff', + cropImagesToSquare: true + } + ); + }, + } ] }; \ No newline at end of file From c686e7ce0e65df9f6c8fdb3da98621f6290f8e06 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Wed, 3 Nov 2021 16:08:26 -0300 Subject: [PATCH 03/18] Hides deprecated items list from inserter and adds transform from dynamic items list to carousel #628. --- ...can-gutenberg-block-dynamic-items-list.css | 1 + ...gutenberg-block-dynamic-items-list.css.map | 2 +- .../tainacan-gutenberg-block-items-list.css | 1 + ...ainacan-gutenberg-block-items-list.css.map | 2 +- .../blocks/dynamic-items-list/edit.js | 2 +- .../blocks/dynamic-items-list/index.js | 4 +- .../blocks/dynamic-items-list/save.js | 8 ++- .../blocks/dynamic-items-list/style.scss | 1 + .../blocks/dynamic-items-list/theme.js | 2 +- .../blocks/dynamic-items-list/theme.vue | 6 +- .../blocks/dynamic-items-list/transforms.js | 66 +++++++++++++++++++ .../blocks/items-list/block.json | 3 +- .../blocks/items-list/style.scss | 1 + .../blocks/items-list/transforms.js | 21 ++++-- 14 files changed, 106 insertions(+), 14 deletions(-) create mode 100644 src/views/gutenberg-blocks/blocks/dynamic-items-list/transforms.js diff --git a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css index 84d77f521..cb50d4043 100644 --- a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css +++ b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css @@ -231,6 +231,7 @@ grid-gap: 24px; gap: 24px; justify-content: space-evenly; + align-items: flex-start; list-style-type: none; } .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid:not(.max-columns-count-1):not(.max-columns-count-2):not(.max-columns-count-3):not(.max-columns-count-4):not(.max-columns-count-5):not(.max-columns-count-6):not(.max-columns-count-7), .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid:not(.max-columns-count-1):not(.max-columns-count-2):not(.max-columns-count-3):not(.max-columns-count-4):not(.max-columns-count-5):not(.max-columns-count-6):not(.max-columns-count-7) { diff --git a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map index d5f8f69a2..ae1adbdde 100644 --- a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map +++ b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["../../views/gutenberg-blocks/blocks/dynamic-items-list/style.scss","../../views/gutenberg-blocks/scss/gutenberg-blocks-variables.scss"], "names": [], "file": "tainacan-gutenberg-block-dynamic-items-list.css" diff --git a/src/assets/css/tainacan-gutenberg-block-items-list.css b/src/assets/css/tainacan-gutenberg-block-items-list.css index bac20bb46..34202819f 100644 --- a/src/assets/css/tainacan-gutenberg-block-items-list.css +++ b/src/assets/css/tainacan-gutenberg-block-items-list.css @@ -34,6 +34,7 @@ grid-template-columns: repeat(auto-fill, 220px); grid-gap: 0px; justify-content: space-evenly; + align-items: flex-start; list-style-type: none; } .wp-block-tainacan-items-list ul.items-list.items-layout-grid li.item-list-item, .wp-block-tainacan-items-list ul.items-list-edit.items-layout-grid li.item-list-item { diff --git a/src/assets/css/tainacan-gutenberg-block-items-list.css.map b/src/assets/css/tainacan-gutenberg-block-items-list.css.map index cca6931bb..8097719b6 100644 --- a/src/assets/css/tainacan-gutenberg-block-items-list.css.map +++ b/src/assets/css/tainacan-gutenberg-block-items-list.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["../../views/gutenberg-blocks/blocks/items-list/style.scss","../../views/gutenberg-blocks/scss/gutenberg-blocks-variables.scss"], "names": [], "file": "tainacan-gutenberg-block-items-list.css" diff --git a/src/views/gutenberg-blocks/blocks/dynamic-items-list/edit.js b/src/views/gutenberg-blocks/blocks/dynamic-items-list/edit.js index e57500182..5c46375c3 100644 --- a/src/views/gutenberg-blocks/blocks/dynamic-items-list/edit.js +++ b/src/views/gutenberg-blocks/blocks/dynamic-items-list/edit.js @@ -490,7 +490,7 @@ export default function({ attributes, setAttributes, className, isSelected, clie isActive: layout === 'mosaic', } ]; - + return content == 'preview' ?
{ } // This is rendered on the theme side. - renderTainacanDynamicItemsBlocks() + renderTainacanDynamicItemsBlocks(); // Also if a theme or plugin requested a reset... document.addEventListener("TainacanReloadDynamicItemsBlock", () => { diff --git a/src/views/gutenberg-blocks/blocks/dynamic-items-list/theme.vue b/src/views/gutenberg-blocks/blocks/dynamic-items-list/theme.vue index c6fab66ed..0b6b8ad5c 100644 --- a/src/views/gutenberg-blocks/blocks/dynamic-items-list/theme.vue +++ b/src/views/gutenberg-blocks/blocks/dynamic-items-list/theme.vue @@ -326,6 +326,7 @@ export default { } }, created() { + this.tainacanAxios = axios.create({ baseURL: this.tainacanApiRoot }); if (tainacan_blocks && tainacan_blocks.nonce) this.tainacanAxios.defaults.headers.common['X-WP-Nonce'] = tainacan_blocks.nonce; @@ -368,8 +369,11 @@ export default { this.totalItems = this.items.length; } else if (this.loadStrategy == 'selection') { - let endpoint = '/collection/' + this.collectionId + '/items?' + qs.stringify({ postin: this.selectedItems, perpage: this.selectedItems.length }) + '&fetch_only=title,url,thumbnail'; + + this.maxItemsNumber = this.selectedItems.length; + let endpoint = '/collection/' + this.collectionId + '/items?' + qs.stringify({ postin: this.selectedItems, perpage: this.maxItemsNumber }) + '&fetch_only=title,url,thumbnail'; + this.tainacanAxios.get(endpoint, { cancelToken: this.itemsRequestSource.token }) .then(response => { diff --git a/src/views/gutenberg-blocks/blocks/dynamic-items-list/transforms.js b/src/views/gutenberg-blocks/blocks/dynamic-items-list/transforms.js new file mode 100644 index 000000000..9bff391e5 --- /dev/null +++ b/src/views/gutenberg-blocks/blocks/dynamic-items-list/transforms.js @@ -0,0 +1,66 @@ +const { createBlock } = wp.blocks; + +export default { + to: [ + { + type: 'block', + blocks: [ 'tainacan/carousel-items-list' ], + transform: ( { + items, + collectionId, + collection, + showName, + gridMargin, + searchURL, + maxItemsNumber, + selectedItems, + loadStrategy, + showCollectionHeader, + showCollectionLabel, + collectionBackgroundColor, + collectionTextColor, + maxColumnsCount, + cropImagesToSquare, + align, + textColor, + fontSize + } ) => { + return createBlock( + 'tainacan/carousel-items-list', + { + items: items, + content: [ { type: true } ], + collection: collection, + collectionId: collectionId, + hideTitle: !showName, + isModalOpen: false, + spaceBetweenItems: gridMargin + 16, + searchURL: searchURL, + itemsRequestSource: '', + maxItemsNumber: maxItemsNumber, + maxItemsPerScreen: maxColumnsCount, + selectedItems: selectedItems, + isLoading: false, + loadStrategy: loadStrategy, + arrowsPosition : 'around', + spaceAroundCarousel: 50, + largeArrows: false, + arrowsStyle : 'type-1', + autoPlay: false, + autoPlaySpeed: 3, + loopSlides: false, + showCollectionHeader: showCollectionHeader, + showCollectionLabel: showCollectionLabel, + isLoadingCollection: false, + collectionBackgroundColor: collectionBackgroundColor, + collectionTextColor: collectionTextColor, + cropImagesToSquare: cropImagesToSquare, + align: align, + textColor: textColor, + fontSize: fontSize + } + ); + }, + } + ] +}; \ No newline at end of file diff --git a/src/views/gutenberg-blocks/blocks/items-list/block.json b/src/views/gutenberg-blocks/blocks/items-list/block.json index 110850a13..db8466cca 100644 --- a/src/views/gutenberg-blocks/blocks/items-list/block.json +++ b/src/views/gutenberg-blocks/blocks/items-list/block.json @@ -97,7 +97,8 @@ "background": false, "gradients": false, "link": true - } + }, + "inserter": false }, "editorScript": "items-list", "editorStyle": "items-list" diff --git a/src/views/gutenberg-blocks/blocks/items-list/style.scss b/src/views/gutenberg-blocks/blocks/items-list/style.scss index b50034261..40b289f2a 100644 --- a/src/views/gutenberg-blocks/blocks/items-list/style.scss +++ b/src/views/gutenberg-blocks/blocks/items-list/style.scss @@ -44,6 +44,7 @@ grid-template-columns: repeat(auto-fill, 220px); grid-gap: 0px; justify-content: space-evenly; + align-items: flex-start; list-style-type: none; li.item-list-item { diff --git a/src/views/gutenberg-blocks/blocks/items-list/transforms.js b/src/views/gutenberg-blocks/blocks/items-list/transforms.js index 36d7aff2e..345138589 100644 --- a/src/views/gutenberg-blocks/blocks/items-list/transforms.js +++ b/src/views/gutenberg-blocks/blocks/items-list/transforms.js @@ -13,7 +13,10 @@ export default { showImage, showName, layout, - gridMargin + gridMargin, + align, + textColor, + fontSize } ) => { return createBlock( 'tainacan/dynamic-items-list', @@ -51,7 +54,10 @@ export default { sampleBackgroundImage: '', mosaicDensity: 6, maxColumnsCount: 4, - cropImagesToSquare: true + cropImagesToSquare: true, + align: align, + textColor: textColor, + fontSize: fontSize } ); }, @@ -62,10 +68,12 @@ export default { transform: ( { selectedItemsObject, selectedItemsHTML, - content, collectionId, showName, - gridMargin + gridMargin, + align, + textColor, + fontSize } ) => { return createBlock( 'tainacan/carousel-items-list', @@ -97,7 +105,10 @@ export default { isLoadingCollection: false, collectionBackgroundColor: '#454647', collectionTextColor: '#ffffff', - cropImagesToSquare: true + cropImagesToSquare: true, + align: align, + textColor: textColor, + fontSize: fontSize } ); }, From c9e762eefb07faf7060bb52c5d5a56ab7355755a Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Wed, 3 Nov 2021 16:19:32 -0300 Subject: [PATCH 04/18] Adds transform from carousel items list to dynamic items list. --- .../blocks/carousel-items-list/index.js | 4 +- .../blocks/carousel-items-list/transforms.js | 73 +++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 src/views/gutenberg-blocks/blocks/carousel-items-list/transforms.js diff --git a/src/views/gutenberg-blocks/blocks/carousel-items-list/index.js b/src/views/gutenberg-blocks/blocks/carousel-items-list/index.js index 956c07742..39540ea88 100644 --- a/src/views/gutenberg-blocks/blocks/carousel-items-list/index.js +++ b/src/views/gutenberg-blocks/blocks/carousel-items-list/index.js @@ -5,11 +5,13 @@ import icon from './icon.js'; import edit from './edit.js'; import save from './save.js'; import deprecated from './deprecated.js'; +import transforms from './transforms.js'; tainacanRegisterBlockType({ metadata, icon, edit, save, - deprecated + deprecated, + transforms }); diff --git a/src/views/gutenberg-blocks/blocks/carousel-items-list/transforms.js b/src/views/gutenberg-blocks/blocks/carousel-items-list/transforms.js new file mode 100644 index 000000000..65bde2f50 --- /dev/null +++ b/src/views/gutenberg-blocks/blocks/carousel-items-list/transforms.js @@ -0,0 +1,73 @@ +const { createBlock } = wp.blocks; + +export default { + to: [ + { + type: 'block', + blocks: [ 'tainacan/dynamic-items-list' ], + transform: ( { + items, + collectionId, + searchURL, + maxItemsNumber, + maxItemsPerScreen, + spaceBetweenItems, + selectedItems, + loadStrategy, + hideTitle, + cropImagesToSquare, + showCollectionHeader, + showCollectionLabel, + collection, + collectionBackgroundColor, + collectionTextColor, + align, + textColor, + fontSize + } ) => { + return createBlock( + 'tainacan/dynamic-items-list', + { + items: items, + content: [ { type: true } ], + collection: collection, + collectionId: collectionId, + showImage: true, + showName: !hideTitle, + layout: 'grid', + isModalOpen: false, + gridMargin: spaceBetweenItems, + searchURL: searchURL, + itemsRequestSource: '', + maxItemsNumber: maxItemsNumber, + order: '', + searchString: '', + selectedItems: selectedItems, + isLoading: false, + loadStrategy: loadStrategy, + showSearchBar: false, + showCollectionHeader: showCollectionHeader, + showCollectionLabel: showCollectionLabel, + isLoadingCollection: false, + collectionBackgroundColor: collectionBackgroundColor, + collectionTextColor: collectionTextColor, + mosaicHeight: 280, + mosaicGridColumns: maxItemsPerScreen, + mosaicGridRows: 3, + mosaicItemFocalPoint: { + x: 0.5, + y: 0.5 + }, + sampleBackgroundImage: '', + mosaicDensity: 6, + maxColumnsCount: 4, + cropImagesToSquare: cropImagesToSquare, + align: align, + textColor: textColor, + fontSize: fontSize + } + ); + }, + } + ] +}; \ No newline at end of file From 05d4c7cc119cd1f0adb1ffff0d8fb6c7cd27c815 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Wed, 3 Nov 2021 16:44:33 -0300 Subject: [PATCH 05/18] Adds deprecation to missing save attributes on dynamic items list. --- .../blocks/dynamic-items-list/deprecated.js | 208 ++++++++++++++++++ 1 file changed, 208 insertions(+) diff --git a/src/views/gutenberg-blocks/blocks/dynamic-items-list/deprecated.js b/src/views/gutenberg-blocks/blocks/dynamic-items-list/deprecated.js index 37b685478..278551853 100644 --- a/src/views/gutenberg-blocks/blocks/dynamic-items-list/deprecated.js +++ b/src/views/gutenberg-blocks/blocks/dynamic-items-list/deprecated.js @@ -1,6 +1,214 @@ const { useBlockProps } = (tainacan_blocks.wp_version < '5.2' ? wp.editor : wp.blockEditor ); export default [ + /* Deprecated to fix the selection strategy on 0.18.7 */ + { + "attributes": { + "content": { + "type": "Array", + "source": "children", + "selector": "div" + }, + "collectionId": { + "type": "String", + "default": "" + }, + "items": { + "type": "Array", + "default": [] + }, + "showImage": { + "type": "Boolean", + "default": true + }, + "showName": { + "type": "Boolean", + "default": true + }, + "layout": { + "type": "String", + "default": "grid" + }, + "isModalOpen": { + "type": "Boolean", + "default": false + }, + "gridMargin": { + "type": "Number", + "default": 0 + }, + "searchURL": { + "type": "String", + "default": "" + }, + "itemsRequestSource": { + "type": "String", + "default": "" + }, + "maxItemsNumber": { + "type": "Number", + "value": 12 + }, + "isLoading": { + "type": "Boolean", + "value": false + }, + "isLoadingCollection": { + "type": "Boolean", + "value": false + }, + "showSearchBar": { + "type": "Boolean", + "value": false + }, + "showCollectionHeader": { + "type": "Boolean", + "value": false + }, + "showCollectionLabel": { + "type": "Boolean", + "value": false + }, + "collection": { + "type": "Object", + "value": {} + }, + "searchString": { + "type": "String", + "default": "" + }, + "selectedItems": { + "type": "Array", + "default": [] + }, + "loadStrategy": { + "type": "String", + "value": "search" + }, + "order": { + "type": "String", + "default": "" + }, + "blockId": { + "type": "String", + "default": "" + }, + "collectionBackgroundColor": { + "type": "String", + "default": "#454647" + }, + "collectionTextColor": { + "type": "String", + "default": "#ffffff" + }, + "mosaicHeight": { + "type": "Number", + "value": 280 + }, + "mosaicGridColumns": { + "type": "Number", + "value": 3 + }, + "mosaicGridRows": { + "type": "Number", + "value": 3 + }, + "sampleBackgroundImage": { + "type": "String", + "default": "" + }, + "mosaicItemFocalPoint": { + "type": "Object", + "default": { + "x": 0.5, + "y": 0.5 + } + }, + "mosaicDensity": { + "type": "Number", + "default": 5 + }, + "maxColumnsCount": { + "type": "Number", + "default": 4 + }, + "cropImagesToSquare": { + "type": "Boolean", + "value": true + } + }, + "supports": { + "align": ["full", "wide"], + "html": false, + "typography": { + "fontSize": true + }, + "color": { + "text": true, + "background": false, + "gradients": false, + "link": true + } + }, + save: function({ attributes, className }) { + const { + content, + blockId, + collectionId, + showImage, + showName, + layout, + gridMargin, + searchURL, + maxItemsNumber, + order, + showSearchBar, + showCollectionHeader, + showCollectionLabel, + collectionBackgroundColor, + collectionTextColor, + mosaicHeight, + mosaicGridRows, + mosaicGridColumns, + mosaicItemFocalPoint, + mosaicDensity, + maxColumnsCount, + cropImagesToSquare + } = attributes; + + // Gets attributes such as style, that are automatically added by the editor hook + const blockProps = tainacan_blocks.wp_version < '5.6' ? { className: className } : useBlockProps.save(); + return
+ { content } +
+ } + }, /* Deprecated when new selection strategy was added */ { "attributes": { From 39de46de943edf0855e76d35b9f20e5be62f26a6 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Thu, 4 Nov 2021 16:40:41 -0300 Subject: [PATCH 06/18] Adds arial label to all modal close buttons due to Buefy new feature. --- package-lock.json | 9 +++++---- package.json | 2 +- src/views/admin/admin.vue | 3 ++- .../edition/importer-mapping-form.vue | 4 +++- .../edition/item-bulk-edition-form.vue | 6 ++++-- .../components/edition/item-edition-form.vue | 18 ++++++++++++------ .../edition/taxonomy-edition-form.vue | 6 ++++-- .../filter-types/checkbox/Checkbox.vue | 3 ++- .../filter-types/taxonomy/Checkbox.vue | 3 ++- .../admin/components/lists/activities-list.vue | 3 ++- .../admin/components/lists/basic-term-item.vue | 6 ++++-- .../components/lists/capabilities-list.vue | 3 ++- .../components/lists/collections-list.vue | 6 ++++-- .../admin/components/lists/items-list.vue | 18 ++++++++++++------ .../components/lists/metadata-mapping-list.vue | 3 ++- .../admin/components/lists/processes-list.vue | 6 ++++-- .../components/lists/recursive-term-item.vue | 6 ++++-- .../components/lists/related-items-list.vue | 3 ++- .../admin/components/lists/taxonomies-list.vue | 6 ++++-- .../compound/child-metadata-list.vue | 6 ++++-- .../relationship/Relationship.vue | 3 ++- .../metadata-types/taxonomy/Taxonomy.vue | 3 ++- .../tainacan-repository-subheader.vue | 3 ++- .../admin/components/other/document-item.vue | 3 ++- src/views/admin/components/other/file-item.vue | 3 ++- .../components/other/item-copy-dialog.vue | 3 ++- src/views/admin/js/axios.js | 3 ++- .../admin/pages/lists/collections-page.vue | 3 ++- src/views/admin/pages/lists/filters-page.vue | 6 ++++-- src/views/admin/pages/lists/items-page.vue | 15 ++++++++++----- src/views/admin/pages/lists/metadata-page.vue | 6 ++++-- src/views/admin/pages/singles/item-page.vue | 3 ++- .../components/view-mode-slideshow.vue | 1 + .../theme-search/theme-items-page.vue | 9 ++++++--- 34 files changed, 122 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac0b15d28..73ce35aa2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2428,9 +2428,9 @@ } }, "buefy": { - "version": "0.9.10", - "resolved": "https://registry.npmjs.org/buefy/-/buefy-0.9.10.tgz", - "integrity": "sha512-xXEoy/NTgBNiIfBTCdHi2Vu5SJJdB046py6ekUvYuUgYwRvulySZksdecVNNWdfEVU8iD4esZaRbTLwCegFcVQ==", + "version": "0.9.11", + "resolved": "https://registry.npmjs.org/buefy/-/buefy-0.9.11.tgz", + "integrity": "sha512-WP32SiaM9WVxDtzgdiq7V2zyIvn41NboPgluVqdB6OAi1/QhjO/63m6hd/jy6Vk8r+zuhIZD+aP9KlQ10EhxTQ==", "requires": { "bulma": "0.9.3" } @@ -4891,7 +4891,8 @@ }, "ini": { "version": "1.3.5", - "resolved": "", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, diff --git a/package.json b/package.json index da8c9600c..db83050c5 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "apexcharts": "^3.29.0", "axios": "^0.21.4", "blurhash": "^1.1.3", - "buefy": "^0.9.10", + "buefy": "^0.9.11", "bulma": "^0.9.3", "conditioner-core": "^2.3.3", "countup.js": "^2.0.8", diff --git a/src/views/admin/admin.vue b/src/views/admin/admin.vue index f622a8698..753eef17e 100644 --- a/src/views/admin/admin.vue +++ b/src/views/admin/admin.vue @@ -111,7 +111,8 @@ }, ariaRole: 'alertdialog', ariaModal: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } }); diff --git a/src/views/admin/components/edition/importer-mapping-form.vue b/src/views/admin/components/edition/importer-mapping-form.vue index 667b29475..e9f16eff0 100644 --- a/src/views/admin/components/edition/importer-mapping-form.vue +++ b/src/views/admin/components/edition/importer-mapping-form.vue @@ -209,6 +209,7 @@ trap-focus aria-modal aria-role="dialog" + :close-button-aria-label="$i18n.get('close')" custom-class="tainacan-modal">
+ custom-class="tainacan-modal" + :close-button-aria-label="$i18n.get('close')">

{{ $i18n.get('label_thumbnail_alt') }}

@@ -593,7 +594,8 @@ trap-focus aria-modal aria-role="dialog" - custom-class="tainacan-modal"> + custom-class="tainacan-modal" + :close-button-aria-label="$i18n.get('close')">

{{ $i18n.get('instruction_write_text') }}

@@ -635,7 +637,8 @@ tabindex="-1" aria-modal aria-role="dialog" - custom-class="tainacan-modal"> + custom-class="tainacan-modal" + :close-button-aria-label="$i18n.get('close')">

{{ $i18n.get('instruction_insert_url') }}

@@ -1174,7 +1177,8 @@ export default { }, }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } else { next() @@ -1558,7 +1562,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, @@ -1681,7 +1686,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, loadExistingItem() { diff --git a/src/views/admin/components/edition/taxonomy-edition-form.vue b/src/views/admin/components/edition/taxonomy-edition-form.vue index d3a9e8803..90a050915 100644 --- a/src/views/admin/components/edition/taxonomy-edition-form.vue +++ b/src/views/admin/components/edition/taxonomy-edition-form.vue @@ -300,7 +300,8 @@ } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } else if (this.isEditingTerm) { this.$buefy.modal.open({ @@ -315,7 +316,8 @@ } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } else { next(); diff --git a/src/views/admin/components/filter-types/checkbox/Checkbox.vue b/src/views/admin/components/filter-types/checkbox/Checkbox.vue index 584b24e1d..415a1dcc2 100644 --- a/src/views/admin/components/filter-types/checkbox/Checkbox.vue +++ b/src/views/admin/components/filter-types/checkbox/Checkbox.vue @@ -206,7 +206,8 @@ } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, } diff --git a/src/views/admin/components/filter-types/taxonomy/Checkbox.vue b/src/views/admin/components/filter-types/taxonomy/Checkbox.vue index 6629cadd8..268a16c49 100644 --- a/src/views/admin/components/filter-types/taxonomy/Checkbox.vue +++ b/src/views/admin/components/filter-types/taxonomy/Checkbox.vue @@ -320,7 +320,8 @@ }, width: 'calc(100% - (4 * var(--tainacan-one-column)))', trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, prepareOptionsForTaxonomy(items) { diff --git a/src/views/admin/components/lists/activities-list.vue b/src/views/admin/components/lists/activities-list.vue index 9c70cc972..a9e287994 100644 --- a/src/views/admin/components/lists/activities-list.vue +++ b/src/views/admin/components/lists/activities-list.vue @@ -184,7 +184,8 @@ notApproveActivity: (activityId) => this.notApproveActivity(activityId) }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, } diff --git a/src/views/admin/components/lists/basic-term-item.vue b/src/views/admin/components/lists/basic-term-item.vue index 1ea215962..290486a4f 100644 --- a/src/views/admin/components/lists/basic-term-item.vue +++ b/src/views/admin/components/lists/basic-term-item.vue @@ -104,7 +104,8 @@ export default { onConfirm: () => { this.removeTerm(); }, }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } else { this.removeTerm(); @@ -126,7 +127,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, eventOnEditTerm() { diff --git a/src/views/admin/components/lists/capabilities-list.vue b/src/views/admin/components/lists/capabilities-list.vue index eced0817c..d6d0e8aa3 100644 --- a/src/views/admin/components/lists/capabilities-list.vue +++ b/src/views/admin/components/lists/capabilities-list.vue @@ -144,7 +144,8 @@ capabilityKey: capabilityKey }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, getCompleteRolesList(roles, rolesInherited) { diff --git a/src/views/admin/components/lists/collections-list.vue b/src/views/admin/components/lists/collections-list.vue index ca963c583..b601e23d4 100644 --- a/src/views/admin/components/lists/collections-list.vue +++ b/src/views/admin/components/lists/collections-list.vue @@ -448,7 +448,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); this.clearContextMenu(); }, @@ -489,7 +490,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, openCollection() { diff --git a/src/views/admin/components/lists/items-list.vue b/src/views/admin/components/lists/items-list.vue index 05071adae..22955fa62 100644 --- a/src/views/admin/components/lists/items-list.vue +++ b/src/views/admin/components/lists/items-list.vue @@ -1447,7 +1447,8 @@ export default { }, width: 'calc(100% - (2 * var(--tainacan-one-column)))', trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, sequenceEditSelectedItems() { @@ -1486,7 +1487,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); this.clearContextMenu(); @@ -1519,7 +1521,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, deleteOneItem(itemId) { @@ -1543,7 +1546,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); this.clearContextMenu(); }, @@ -1576,7 +1580,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, deleteSelectedItems() { @@ -1618,7 +1623,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, openItem() { diff --git a/src/views/admin/components/lists/metadata-mapping-list.vue b/src/views/admin/components/lists/metadata-mapping-list.vue index efec94a50..f54d74658 100644 --- a/src/views/admin/components/lists/metadata-mapping-list.vue +++ b/src/views/admin/components/lists/metadata-mapping-list.vue @@ -151,7 +151,8 @@ trap-focus aria-modal aria-role="dialog" - custom-class="tainacan-modal"> + custom-class="tainacan-modal" + :close-button-aria-label="$i18n.get('close')">
{ this.removeTerm(); }, }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); } else { this.removeTerm(); @@ -279,7 +280,8 @@ export default { } }, trapFocus: true, - customClass: 'tainacan-modal' + customClass: 'tainacan-modal', + closeButtonAriaLabel: this.$i18n.get('close') }); }, eventOnChildTermDeleted(parentTermId) { diff --git a/src/views/admin/components/lists/related-items-list.vue b/src/views/admin/components/lists/related-items-list.vue index 897dc8822..609f2063a 100644 --- a/src/views/admin/components/lists/related-items-list.vue +++ b/src/views/admin/components/lists/related-items-list.vue @@ -132,7 +132,8 @@ :width="1200" :active.sync="editItemModal" @close="reloadRelatedItems" - custom-class="tainacan-modal"> + custom-class="tainacan-modal" + :close-button-aria-label="$i18n.get('close')">