From e1d4868b373d904685e4d66762f718088e4ea8f1 Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Mon, 10 Jul 2023 20:07:29 +0200 Subject: [PATCH 01/10] BUGFIX: 3574 initialize foreign referenced nodes --- packages/neos-ui/src/manifest.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/neos-ui/src/manifest.js b/packages/neos-ui/src/manifest.js index e95c59315c..57070f44a2 100644 --- a/packages/neos-ui/src/manifest.js +++ b/packages/neos-ui/src/manifest.js @@ -20,6 +20,7 @@ import { import initializeContentDomNode from '@neos-project/neos-ui-guest-frame/src/initializeContentDomNode'; import style from '@neos-project/neos-ui-guest-frame/src/style.css'; +import backend from '@neos-project/neos-ui-backend-connector'; manifest('main', {}, globalRegistry => { // @@ -513,7 +514,7 @@ manifest('main', {}, globalRegistry => { // When the server advices to replace a node (e.g. on property change), put the delivered html to the // correct place inside the DOM // - serverFeedbackHandlers.set('Neos.Neos.Ui:ReloadContentOutOfBand/Main', (feedbackPayload, {store, globalRegistry}) => { + serverFeedbackHandlers.set('Neos.Neos.Ui:ReloadContentOutOfBand/Main', async (feedbackPayload, {store, globalRegistry}) => { const {contextPath, renderedContent, nodeDomAddress} = feedbackPayload; const domNode = nodeDomAddress && findNodeInGuestFrame( nodeDomAddress.contextPath, @@ -543,6 +544,27 @@ manifest('main', {}, globalRegistry => { const children = findAllChildNodes(contentElement); + // in case there are foreign refernced nodes, we need to put them into the store: + const uninitializedReferencedNodes = []; + for (const el of children) { + const contextPath = el.getAttribute('data-__neos-node-contextpath'); + if (!selectors.CR.Nodes.byContextPathSelector(contextPath)(store.getState())) { + uninitializedReferencedNodes.push(contextPath); + } + } + if (uninitializedReferencedNodes.length) { + const {q} = backend.get(); + const additionalNodes = await q(uninitializedReferencedNodes).get(); + if (additionalNodes.length) { + store.dispatch(actions.CR.Nodes.merge( + additionalNodes.reduce((carry, node) => { + carry[node.contextPath] = node; + return carry; + }, {}) + )); + } + } + const nodes = Object.assign( {[contextPath]: selectors.CR.Nodes.byContextPathSelector(contextPath)(store.getState())}, ...children.map(el => { From a8e6d511737a757964caae86d056a4ecf626f2e5 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Wed, 12 Jul 2023 11:57:11 +0000 Subject: [PATCH 02/10] Updating composer dependency and npm versions for release of 7.3.19 --- Resources/Public/JavaScript/Host.js.LICENSE | 18 +++---- lerna.json | 2 +- packages/babel-preset-neos-ui/package.json | 2 +- packages/build-essentials/package.json | 4 +- .../debug-reason-for-rendering/package.json | 4 +- packages/jest-preset-neos-ui/package.json | 2 +- packages/neos-ts-interfaces/package.json | 8 +-- .../neos-ui-backend-connector/package.json | 12 ++--- .../neos-ui-ckeditor-bindings/package.json | 24 ++++----- .../neos-ui-ckeditor5-bindings/package.json | 24 ++++----- packages/neos-ui-constants/package.json | 8 +-- packages/neos-ui-containers/package.json | 16 +++--- .../neos-ui-contentrepository/package.json | 10 ++-- packages/neos-ui-decorators/package.json | 8 +-- packages/neos-ui-editors/package.json | 28 +++++----- packages/neos-ui-extensibility/package.json | 6 +-- packages/neos-ui-guest-frame/package.json | 12 ++--- packages/neos-ui-i18n/package.json | 14 ++--- packages/neos-ui-inspector/package.json | 8 +-- packages/neos-ui-redux-store/package.json | 16 +++--- packages/neos-ui-sagas/package.json | 14 ++--- packages/neos-ui-validators/package.json | 14 ++--- packages/neos-ui-views/package.json | 20 +++---- packages/neos-ui/package.json | 54 +++++++++---------- packages/positional-array-sorter/package.json | 6 +-- packages/react-proptypes/package.json | 8 +-- packages/react-ui-components/package.json | 12 ++--- packages/utils-helpers/package.json | 8 +-- packages/utils-helpers/src/getVersion.ts | 2 +- packages/utils-logger/package.json | 8 +-- packages/utils-redux/package.json | 8 +-- 31 files changed, 190 insertions(+), 190 deletions(-) diff --git a/Resources/Public/JavaScript/Host.js.LICENSE b/Resources/Public/JavaScript/Host.js.LICENSE index 699cc1fe05..4bcbeaeeda 100644 --- a/Resources/Public/JavaScript/Host.js.LICENSE +++ b/Resources/Public/JavaScript/Host.js.LICENSE @@ -49,15 +49,6 @@ and limitations under the License. * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ -/** - * @license - * Lodash - * Copyright OpenJS Foundation and other contributors - * Released under MIT license - * Based on Underscore.js 1.8.3 - * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors - */ - /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license @@ -69,6 +60,15 @@ object-assign @license MIT */ +/** + * @license + * Lodash + * Copyright OpenJS Foundation and other contributors + * Released under MIT license + * Based on Underscore.js 1.8.3 + * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors + */ + /*! * Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) diff --git a/lerna.json b/lerna.json index 3f78070334..f8f28867b4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.5.1", - "version": "7.3.18", + "version": "7.3.19", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/babel-preset-neos-ui/package.json b/packages/babel-preset-neos-ui/package.json index ee5388432b..88a4955c3f 100644 --- a/packages/babel-preset-neos-ui/package.json +++ b/packages/babel-preset-neos-ui/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/babel-preset-neos-ui", - "version": "7.3.18", + "version": "7.3.19", "description": "The babel preset for all packags of the neos-ui mono-repo.", "main": "./src/index.js", "private": true, diff --git a/packages/build-essentials/package.json b/packages/build-essentials/package.json index e68cfd0bd3..88f3277a28 100644 --- a/packages/build-essentials/package.json +++ b/packages/build-essentials/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/build-essentials", - "version": "7.3.18", + "version": "7.3.19", "description": "Dependencies for building @neos-project packages", "repository": "neos/neos-ui", "bugs": "https://github.com/neos/neos-ui/issues", @@ -20,7 +20,7 @@ "lint": "eslint src" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19" }, "dependencies": { "@ckeditor/ckeditor5-dev-utils": "^12.0.1", diff --git a/packages/debug-reason-for-rendering/package.json b/packages/debug-reason-for-rendering/package.json index 0d310f6851..f2db974159 100644 --- a/packages/debug-reason-for-rendering/package.json +++ b/packages/debug-reason-for-rendering/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/debug-reason-for-rendering", - "version": "7.3.18", + "version": "7.3.19", "description": "React Performance Optimization Utility - Why does a component re-render?", "repository": "neos/neos-ui", "bugs": "https://github.com/neos/neos-ui/issues", @@ -8,7 +8,7 @@ "main": "./src/index.js", "license": "MIT", "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19" }, "peerDependencies": { "react": "^16.0.0" diff --git a/packages/jest-preset-neos-ui/package.json b/packages/jest-preset-neos-ui/package.json index aa48d421f9..eb71fc5f01 100644 --- a/packages/jest-preset-neos-ui/package.json +++ b/packages/jest-preset-neos-ui/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/jest-preset-neos-ui", - "version": "7.3.18", + "version": "7.3.19", "description": "The jest preset for all packags of the neos-ui mono-repo.", "main": "jest-preset.json", "private": true, diff --git a/packages/neos-ts-interfaces/package.json b/packages/neos-ts-interfaces/package.json index e6cb8f637b..c1fe647cc3 100644 --- a/packages/neos-ts-interfaces/package.json +++ b/packages/neos-ts-interfaces/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ts-interfaces", - "version": "7.3.18", + "version": "7.3.19", "description": "Neos domain-related TypeScript interfaces", "private": true, "main": "src/index.ts", @@ -13,9 +13,9 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-backend-connector/package.json b/packages/neos-ui-backend-connector/package.json index 43caf6843d..afe5ad8397 100644 --- a/packages/neos-ui-backend-connector/package.json +++ b/packages/neos-ui-backend-connector/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-backend-connector", - "version": "7.3.18", + "version": "7.3.19", "description": "Endoints and fetch cals to the Neos CMS backend", "private": true, "main": "./src/index.ts", @@ -14,13 +14,13 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "dependencies": { - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/utils-redux": "7.3.18" + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/utils-redux": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-ckeditor-bindings/package.json b/packages/neos-ui-ckeditor-bindings/package.json index b42dc6ad43..5e3856f044 100644 --- a/packages/neos-ui-ckeditor-bindings/package.json +++ b/packages/neos-ui-ckeditor-bindings/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-ckeditor-bindings", - "version": "7.3.18", + "version": "7.3.19", "description": "Prepare CKEditor for the Neos CMS UI", "private": true, "main": "./src/manifest.js", @@ -14,19 +14,19 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "dependencies": { - "@neos-project/neos-ui-backend-connector": "7.3.18", - "@neos-project/neos-ui-decorators": "7.3.18", - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/neos-ui-guest-frame": "7.3.18", - "@neos-project/neos-ui-i18n": "7.3.18", - "@neos-project/neos-ui-redux-store": "7.3.18", - "@neos-project/react-ui-components": "7.3.18", - "@neos-project/utils-helpers": "7.3.18" + "@neos-project/neos-ui-backend-connector": "7.3.19", + "@neos-project/neos-ui-decorators": "7.3.19", + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/neos-ui-guest-frame": "7.3.19", + "@neos-project/neos-ui-i18n": "7.3.19", + "@neos-project/neos-ui-redux-store": "7.3.19", + "@neos-project/react-ui-components": "7.3.19", + "@neos-project/utils-helpers": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-ckeditor5-bindings/package.json b/packages/neos-ui-ckeditor5-bindings/package.json index 25a8f0b927..ccaaf280ea 100644 --- a/packages/neos-ui-ckeditor5-bindings/package.json +++ b/packages/neos-ui-ckeditor5-bindings/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-ckeditor5-bindings", - "version": "7.3.18", + "version": "7.3.19", "description": "Prepare CKEditor5 for the Neos CMS UI", "private": true, "main": "./src/manifest.js", @@ -9,9 +9,9 @@ "test:watch": "yarn jest --watch" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18", + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19", "esbuild": "~0.17.0" }, "dependencies": { @@ -27,14 +27,14 @@ "@ckeditor/ckeditor5-remove-format": "^10.0.0", "@ckeditor/ckeditor5-table": "^13.0.0", "@ckeditor/ckeditor5-widget": "^11.0.2", - "@neos-project/neos-ui-backend-connector": "7.3.18", - "@neos-project/neos-ui-decorators": "7.3.18", - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/neos-ui-guest-frame": "7.3.18", - "@neos-project/neos-ui-i18n": "7.3.18", - "@neos-project/neos-ui-redux-store": "7.3.18", - "@neos-project/react-ui-components": "7.3.18", - "@neos-project/utils-helpers": "7.3.18", + "@neos-project/neos-ui-backend-connector": "7.3.19", + "@neos-project/neos-ui-decorators": "7.3.19", + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/neos-ui-guest-frame": "7.3.19", + "@neos-project/neos-ui-i18n": "7.3.19", + "@neos-project/neos-ui-redux-store": "7.3.19", + "@neos-project/react-ui-components": "7.3.19", + "@neos-project/utils-helpers": "7.3.19", "raw-loader": "^0.5" }, "license": "GNU GPLv3", diff --git a/packages/neos-ui-constants/package.json b/packages/neos-ui-constants/package.json index 918b07605d..068f49b4c5 100644 --- a/packages/neos-ui-constants/package.json +++ b/packages/neos-ui-constants/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-constants", - "version": "7.3.18", + "version": "7.3.19", "description": "Container package to store Neos CMS UI constants", "private": true, "main": "./src/index.js", @@ -14,9 +14,9 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-containers/package.json b/packages/neos-ui-containers/package.json index 67c988f412..d421f5d0c2 100644 --- a/packages/neos-ui-containers/package.json +++ b/packages/neos-ui-containers/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-containers", - "version": "7.3.18", + "version": "7.3.19", "description": "Smart components for Neos CMS UI.", "private": true, "main": "./src/index.js", @@ -13,15 +13,15 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "dependencies": { - "@neos-project/neos-ui-decorators": "7.3.18", - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/react-ui-components": "7.3.18", - "@neos-project/utils-logger": "7.3.18" + "@neos-project/neos-ui-decorators": "7.3.19", + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/react-ui-components": "7.3.19", + "@neos-project/utils-logger": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-contentrepository/package.json b/packages/neos-ui-contentrepository/package.json index cc7812064e..66cab499db 100644 --- a/packages/neos-ui-contentrepository/package.json +++ b/packages/neos-ui-contentrepository/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-contentrepository", - "version": "7.3.18", + "version": "7.3.19", "description": "Bindings for the Neos ContentRepository", "private": true, "main": "./src/manifest.js", @@ -14,12 +14,12 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "dependencies": { - "@neos-project/neos-ui-extensibility": "7.3.18" + "@neos-project/neos-ui-extensibility": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-decorators/package.json b/packages/neos-ui-decorators/package.json index 13b749bf01..62eb3a758e 100644 --- a/packages/neos-ui-decorators/package.json +++ b/packages/neos-ui-decorators/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-decorators", - "version": "7.3.18", + "version": "7.3.19", "description": "Decorators for Neos CMS UI.", "private": true, "main": "./src/index.ts", @@ -14,9 +14,9 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "peerDependencies": { "prop-types": "^15.5.10", diff --git a/packages/neos-ui-editors/package.json b/packages/neos-ui-editors/package.json index 0585d06acf..0214dfcf6b 100644 --- a/packages/neos-ui-editors/package.json +++ b/packages/neos-ui-editors/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-editors", - "version": "7.3.18", + "version": "7.3.19", "description": "Neos CMS UI Editors for use in the inspector.", "main": "src/manifest.js", "private": true, @@ -14,22 +14,22 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/debug-reason-for-rendering": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18", + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/debug-reason-for-rendering": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19", "react-dnd-test-backend": "^7.0.2" }, "dependencies": { - "@neos-project/neos-ui-ckeditor-bindings": "7.3.18", - "@neos-project/neos-ui-ckeditor5-bindings": "7.3.18", - "@neos-project/neos-ui-constants": "7.3.18", - "@neos-project/neos-ui-decorators": "7.3.18", - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/neos-ui-i18n": "7.3.18", - "@neos-project/neos-ui-inspector": "7.3.18", - "@neos-project/neos-ui-redux-store": "7.3.18", - "@neos-project/react-ui-components": "7.3.18" + "@neos-project/neos-ui-ckeditor-bindings": "7.3.19", + "@neos-project/neos-ui-ckeditor5-bindings": "7.3.19", + "@neos-project/neos-ui-constants": "7.3.19", + "@neos-project/neos-ui-decorators": "7.3.19", + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/neos-ui-i18n": "7.3.19", + "@neos-project/neos-ui-inspector": "7.3.19", + "@neos-project/neos-ui-redux-store": "7.3.19", + "@neos-project/react-ui-components": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-extensibility/package.json b/packages/neos-ui-extensibility/package.json index 9827a8f550..01676ffbb1 100644 --- a/packages/neos-ui-extensibility/package.json +++ b/packages/neos-ui-extensibility/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-extensibility", - "version": "7.3.18", + "version": "7.3.19", "description": "Extensibility mechanisms for the Neos CMS UI", "repository": "neos/neos-ui", "bugs": "https://github.com/neos/neos-ui/issues", @@ -17,8 +17,8 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18", + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19", "typescript": "3.2.2" }, "dependencies": { diff --git a/packages/neos-ui-guest-frame/package.json b/packages/neos-ui-guest-frame/package.json index befa4fba72..7adff31c71 100644 --- a/packages/neos-ui-guest-frame/package.json +++ b/packages/neos-ui-guest-frame/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-guest-frame", - "version": "7.3.18", + "version": "7.3.19", "description": "Guest frame initialization bindings", "private": true, "main": "./src/manifest.js", @@ -14,13 +14,13 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "dependencies": { - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/utils-helpers": "7.3.18" + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/utils-helpers": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-i18n/package.json b/packages/neos-ui-i18n/package.json index 9f66cc1e06..4932245144 100644 --- a/packages/neos-ui-i18n/package.json +++ b/packages/neos-ui-i18n/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-i18n", - "version": "7.3.18", + "version": "7.3.19", "description": "I18n utilities and components for Neos CMS UI.", "private": true, "main": "./src/index.tsx", @@ -14,14 +14,14 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "dependencies": { - "@neos-project/neos-ui-decorators": "7.3.18", - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/utils-logger": "7.3.18" + "@neos-project/neos-ui-decorators": "7.3.19", + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/utils-logger": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-inspector/package.json b/packages/neos-ui-inspector/package.json index 56e0bc2087..919571dab7 100644 --- a/packages/neos-ui-inspector/package.json +++ b/packages/neos-ui-inspector/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-inspector", - "version": "7.3.18", + "version": "7.3.19", "description": "Components for integrating views and editors into the Neos CMS UI inspector.", "private": true, "main": "./src/index.js", @@ -14,9 +14,9 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-redux-store/package.json b/packages/neos-ui-redux-store/package.json index c915757636..1c474c5ee9 100644 --- a/packages/neos-ui-redux-store/package.json +++ b/packages/neos-ui-redux-store/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-redux-store", - "version": "7.3.18", + "version": "7.3.19", "description": "Redux store implementation for the Neos CMS UI", "private": true, "main": "./src/index.ts", @@ -14,15 +14,15 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "dependencies": { - "@neos-project/neos-ts-interfaces": "7.3.18", - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/neos-ui-validators": "7.3.18", - "@neos-project/utils-redux": "7.3.18" + "@neos-project/neos-ts-interfaces": "7.3.19", + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/neos-ui-validators": "7.3.19", + "@neos-project/utils-redux": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-sagas/package.json b/packages/neos-ui-sagas/package.json index ce6bd3f076..3f03532ef1 100644 --- a/packages/neos-ui-sagas/package.json +++ b/packages/neos-ui-sagas/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-sagas", - "version": "7.3.18", + "version": "7.3.19", "description": "Redux Sagas implementation for the Neos CMS UI", "private": true, "main": "src/index.js", @@ -14,14 +14,14 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "dependencies": { - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/neos-ui-validators": "7.3.18", - "@neos-project/utils-redux": "7.3.18" + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/neos-ui-validators": "7.3.19", + "@neos-project/utils-redux": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-validators/package.json b/packages/neos-ui-validators/package.json index 5c79c5c7a2..7f51fa7897 100644 --- a/packages/neos-ui-validators/package.json +++ b/packages/neos-ui-validators/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-validators", - "version": "7.3.18", + "version": "7.3.19", "description": "Validators for Neos CMS UI.", "private": true, "main": "./src/index.ts", @@ -12,14 +12,14 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "dependencies": { - "@neos-project/build-essentials": "7.3.18", - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/neos-ui-i18n": "7.3.18", - "@neos-project/utils-logger": "7.3.18" + "@neos-project/build-essentials": "7.3.19", + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/neos-ui-i18n": "7.3.19", + "@neos-project/utils-logger": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui-views/package.json b/packages/neos-ui-views/package.json index 03033d3892..a92661ff29 100644 --- a/packages/neos-ui-views/package.json +++ b/packages/neos-ui-views/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui-views", - "version": "7.3.18", + "version": "7.3.19", "description": "Neos CMS UI Views for use in the inspector.", "main": "./src/index.js", "private": true, @@ -12,18 +12,18 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/debug-reason-for-rendering": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/debug-reason-for-rendering": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "dependencies": { "@neos-project/brand": "^1.1.0", - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/neos-ui-i18n": "7.3.18", - "@neos-project/neos-ui-inspector": "7.3.18", - "@neos-project/neos-ui-redux-store": "7.3.18", - "@neos-project/react-ui-components": "7.3.18" + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/neos-ui-i18n": "7.3.19", + "@neos-project/neos-ui-inspector": "7.3.19", + "@neos-project/neos-ui-redux-store": "7.3.19", + "@neos-project/react-ui-components": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/neos-ui/package.json b/packages/neos-ui/package.json index c73db670d8..56848ecd1a 100644 --- a/packages/neos-ui/package.json +++ b/packages/neos-ui/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/neos-ui", - "version": "7.3.18", + "version": "7.3.19", "description": "Neos CMS UI written in ReactJS and a tonn of other fun technology.", "main": "Resources/Public/JavaScript/Host.js", "private": true, @@ -14,36 +14,36 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/debug-reason-for-rendering": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18", + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/debug-reason-for-rendering": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19", "redux-saga-test-plan": "^3.6.0" }, "dependencies": { "@neos-project/brand": "^1.1.0", - "@neos-project/neos-ui-backend-connector": "7.3.18", - "@neos-project/neos-ui-ckeditor-bindings": "7.3.18", - "@neos-project/neos-ui-ckeditor5-bindings": "7.3.18", - "@neos-project/neos-ui-constants": "7.3.18", - "@neos-project/neos-ui-containers": "7.3.18", - "@neos-project/neos-ui-contentrepository": "7.3.18", - "@neos-project/neos-ui-decorators": "7.3.18", - "@neos-project/neos-ui-editors": "7.3.18", - "@neos-project/neos-ui-extensibility": "7.3.18", - "@neos-project/neos-ui-guest-frame": "7.3.18", - "@neos-project/neos-ui-i18n": "7.3.18", - "@neos-project/neos-ui-inspector": "7.3.18", - "@neos-project/neos-ui-redux-store": "7.3.18", - "@neos-project/neos-ui-sagas": "7.3.18", - "@neos-project/neos-ui-validators": "7.3.18", - "@neos-project/neos-ui-views": "7.3.18", - "@neos-project/positional-array-sorter": "7.3.18", - "@neos-project/react-proptypes": "7.3.18", - "@neos-project/react-ui-components": "7.3.18", - "@neos-project/utils-helpers": "7.3.18", - "@neos-project/utils-logger": "7.3.18", - "@neos-project/utils-redux": "7.3.18" + "@neos-project/neos-ui-backend-connector": "7.3.19", + "@neos-project/neos-ui-ckeditor-bindings": "7.3.19", + "@neos-project/neos-ui-ckeditor5-bindings": "7.3.19", + "@neos-project/neos-ui-constants": "7.3.19", + "@neos-project/neos-ui-containers": "7.3.19", + "@neos-project/neos-ui-contentrepository": "7.3.19", + "@neos-project/neos-ui-decorators": "7.3.19", + "@neos-project/neos-ui-editors": "7.3.19", + "@neos-project/neos-ui-extensibility": "7.3.19", + "@neos-project/neos-ui-guest-frame": "7.3.19", + "@neos-project/neos-ui-i18n": "7.3.19", + "@neos-project/neos-ui-inspector": "7.3.19", + "@neos-project/neos-ui-redux-store": "7.3.19", + "@neos-project/neos-ui-sagas": "7.3.19", + "@neos-project/neos-ui-validators": "7.3.19", + "@neos-project/neos-ui-views": "7.3.19", + "@neos-project/positional-array-sorter": "7.3.19", + "@neos-project/react-proptypes": "7.3.19", + "@neos-project/react-ui-components": "7.3.19", + "@neos-project/utils-helpers": "7.3.19", + "@neos-project/utils-logger": "7.3.19", + "@neos-project/utils-redux": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/positional-array-sorter/package.json b/packages/positional-array-sorter/package.json index 890c8d84d2..23b2caa18d 100644 --- a/packages/positional-array-sorter/package.json +++ b/packages/positional-array-sorter/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/positional-array-sorter", - "version": "7.3.18", + "version": "7.3.19", "description": "Flexible array sorter that sorts an array according to a 'position' meta data.", "repository": "neos/neos-ui", "bugs": "https://github.com/neos/neos-ui/issues", @@ -18,8 +18,8 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19", "typescript": "3.2.2" }, "jest": { diff --git a/packages/react-proptypes/package.json b/packages/react-proptypes/package.json index e66d48749f..73f06c311b 100644 --- a/packages/react-proptypes/package.json +++ b/packages/react-proptypes/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/react-proptypes", - "version": "7.3.18", + "version": "7.3.19", "description": "Neos CMS specific proptypes for react", "private": true, "main": "./src/index.js", @@ -14,9 +14,9 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/react-ui-components/package.json b/packages/react-ui-components/package.json index ba12401375..9789bc515d 100644 --- a/packages/react-ui-components/package.json +++ b/packages/react-ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/react-ui-components", - "version": "7.3.18", + "version": "7.3.19", "description": "The UI components which power the Neos backend application.", "repository": "neos/neos-ui", "bugs": "https://github.com/neos/neos-ui/issues", @@ -22,11 +22,11 @@ "start": "cross-env STORY=true start-storybook -p 9001" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/debug-reason-for-rendering": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18", - "@neos-project/utils-helpers": "7.3.18", + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/debug-reason-for-rendering": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19", + "@neos-project/utils-helpers": "7.3.19", "@storybook/addon-info": "^3.2.16", "@storybook/addon-knobs": "3.2.16", "@storybook/react": "3.2.16", diff --git a/packages/utils-helpers/package.json b/packages/utils-helpers/package.json index 904021c002..d703c6894d 100644 --- a/packages/utils-helpers/package.json +++ b/packages/utils-helpers/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/utils-helpers", - "version": "7.3.18", + "version": "7.3.19", "description": "Helper functions for Neos CMS UI.", "private": true, "main": "./src/index.ts", @@ -14,9 +14,9 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/utils-helpers/src/getVersion.ts b/packages/utils-helpers/src/getVersion.ts index 4df036eda0..aabd795257 100644 --- a/packages/utils-helpers/src/getVersion.ts +++ b/packages/utils-helpers/src/getVersion.ts @@ -1,5 +1,5 @@ const getVersion = () => { - return 'v7.3.18'; + return 'v7.3.19'; }; export default getVersion; diff --git a/packages/utils-logger/package.json b/packages/utils-logger/package.json index 5bb823c696..156dbf4210 100644 --- a/packages/utils-logger/package.json +++ b/packages/utils-logger/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/utils-logger", - "version": "7.3.18", + "version": "7.3.19", "description": "Logger implementation for Neos CMS UI.", "private": true, "main": "./src/index.ts", @@ -14,9 +14,9 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "license": "GNU GPLv3", "jest": { diff --git a/packages/utils-redux/package.json b/packages/utils-redux/package.json index c381033787..5ca98a0a85 100644 --- a/packages/utils-redux/package.json +++ b/packages/utils-redux/package.json @@ -1,6 +1,6 @@ { "name": "@neos-project/utils-redux", - "version": "7.3.18", + "version": "7.3.19", "description": "Neos CMS UI Redux Helper utilitites", "private": true, "main": "./src/index.ts", @@ -14,9 +14,9 @@ "jest": "NODE_ENV=test jest" }, "devDependencies": { - "@neos-project/babel-preset-neos-ui": "7.3.18", - "@neos-project/build-essentials": "7.3.18", - "@neos-project/jest-preset-neos-ui": "7.3.18" + "@neos-project/babel-preset-neos-ui": "7.3.19", + "@neos-project/build-essentials": "7.3.19", + "@neos-project/jest-preset-neos-ui": "7.3.19" }, "license": "GNU GPLv3", "jest": { From 58d1c342327ef9f199b8a197500019eeecd2cd3b Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Mon, 7 Aug 2023 10:58:44 +0200 Subject: [PATCH 03/10] BUGFIX: Image cropper has incorrect height with 150% zoom The `containerHeight` should be (on my pc) `532px` but instead is higher with `617px` as the `ReactCrop` component will already be rendered and falsifies the result (stretches the inner height). To get the correct height of an empty SecondaryEditor, we either need to calculate `100vh - 41px - 41px` (the size of the upper toolbars) An alternative approach would be, to `display: none` everything in the secondary editor (especially the `ReactCrop` component) to be able to calculate the correct height without any inner influence, and later show the inner contents again. --- .../src/SecondaryEditors/ImageCropper/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/neos-ui-editors/src/SecondaryEditors/ImageCropper/index.js b/packages/neos-ui-editors/src/SecondaryEditors/ImageCropper/index.js index 6a9bd63445..0fc6c0c0ca 100644 --- a/packages/neos-ui-editors/src/SecondaryEditors/ImageCropper/index.js +++ b/packages/neos-ui-editors/src/SecondaryEditors/ImageCropper/index.js @@ -86,11 +86,12 @@ export default class ImageCropper extends PureComponent { componentDidMount() { // // Calculate and set maximum height for the cropped image - const containerHeight = this.containerNode.parentElement.clientHeight; + const secondaryEditorHeight = window.innerHeight - 41 - 41; const toolbarStyles = getComputedStyle(this.toolbarNode); const toolbarFullHeight = parseInt(toolbarStyles.height, 10) + parseInt(toolbarStyles['margin-top'], 10) + parseInt(toolbarStyles['margin-bottom'], 10); const spacing = 32; - const height = (containerHeight - toolbarFullHeight - spacing) + 'px'; + const height = (secondaryEditorHeight - toolbarFullHeight - spacing) + 'px'; + const imageNode = this.containerNode.querySelector('.ReactCrop__image'); const imageCopyNode = this.containerNode.querySelector('.ReactCrop__image-copy'); imageNode.style.maxHeight = height; From d65b76a5bb2e87e869157923983d56ff6161ae87 Mon Sep 17 00:00:00 2001 From: Marc Henry Schultz <85400359+mhsdesign@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:02:19 +0200 Subject: [PATCH 04/10] TASK: Typo Co-authored-by: Wilhelm Behncke <2522299+grebaldi@users.noreply.github.com> --- packages/neos-ui/src/manifest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/neos-ui/src/manifest.js b/packages/neos-ui/src/manifest.js index 57070f44a2..c456e89bb0 100644 --- a/packages/neos-ui/src/manifest.js +++ b/packages/neos-ui/src/manifest.js @@ -544,7 +544,7 @@ manifest('main', {}, globalRegistry => { const children = findAllChildNodes(contentElement); - // in case there are foreign refernced nodes, we need to put them into the store: + // in case there are foreign referenced nodes, we need to put them into the store: const uninitializedReferencedNodes = []; for (const el of children) { const contextPath = el.getAttribute('data-__neos-node-contextpath'); From cc7df40fdee86d275f5482a9d10ed19bfde54b99 Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:41:16 +0200 Subject: [PATCH 05/10] TASK: Allow node 16 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 335ff3a8ff..9f7c1551e8 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "vfile-message": "^2.0.2" }, "engines": { - "node": "~14" + "node": "~14 || ~16" }, "devDependencies": { "@neos-project/brand": "^1.1.0", From 52e33a85a865a2c26d4f7a669eaf6ff27e7935e4 Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:47:58 +0200 Subject: [PATCH 06/10] BUGFIX Prevent prop `preventClosing` being passed to dom --- packages/react-ui-components/src/Dialog/dialog.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-ui-components/src/Dialog/dialog.tsx b/packages/react-ui-components/src/Dialog/dialog.tsx index 7f391b81ab..1fe0f62500 100644 --- a/packages/react-ui-components/src/Dialog/dialog.tsx +++ b/packages/react-ui-components/src/Dialog/dialog.tsx @@ -190,6 +190,7 @@ class DialogWithOverlay extends PureComponent { actions, theme, type, + preventClosing, onRequestClose, ...rest } = this.props; From 627145dab881232f9c2ca4d13173624389017bab Mon Sep 17 00:00:00 2001 From: Marc Henry Schultz <85400359+mhsdesign@users.noreply.github.com> Date: Thu, 17 Aug 2023 12:23:24 +0200 Subject: [PATCH 07/10] BUGFIX: More descriptive code Co-authored-by: Robert Baruck --- .../src/SecondaryEditors/ImageCropper/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/neos-ui-editors/src/SecondaryEditors/ImageCropper/index.js b/packages/neos-ui-editors/src/SecondaryEditors/ImageCropper/index.js index 0fc6c0c0ca..32acd4dca0 100644 --- a/packages/neos-ui-editors/src/SecondaryEditors/ImageCropper/index.js +++ b/packages/neos-ui-editors/src/SecondaryEditors/ImageCropper/index.js @@ -86,7 +86,9 @@ export default class ImageCropper extends PureComponent { componentDidMount() { // // Calculate and set maximum height for the cropped image - const secondaryEditorHeight = window.innerHeight - 41 - 41; + // The upper toolbars (the publish tool bar and ckeditor bar) are each 41px + const upperToolbarHeights = 41 + 41; + const secondaryEditorHeight = window.innerHeight - upperToolbarHeights; const toolbarStyles = getComputedStyle(this.toolbarNode); const toolbarFullHeight = parseInt(toolbarStyles.height, 10) + parseInt(toolbarStyles['margin-top'], 10) + parseInt(toolbarStyles['margin-bottom'], 10); const spacing = 32; From 50917492bb97c5ccf8fca64b70081e09573ed396 Mon Sep 17 00:00:00 2001 From: Yannis Viol <57659527+yvirtp@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:27:35 +0200 Subject: [PATCH 08/10] Update Main.xlf: Add 'add' to the translation of the ui --- Resources/Private/Translations/en/Main.xlf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Private/Translations/en/Main.xlf b/Resources/Private/Translations/en/Main.xlf index 010f7d1958..b3cd111a24 100644 --- a/Resources/Private/Translations/en/Main.xlf +++ b/Resources/Private/Translations/en/Main.xlf @@ -11,6 +11,9 @@ Please select the position at which you want {source} inserted relative to {target}. + + Add + Insert From 3ba0f5642039f67bb1eb8f0b098f2257bdde8eac Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Thu, 24 Aug 2023 20:55:07 +0200 Subject: [PATCH 09/10] TASK: Translated using Weblate (Spanish) Currently translated at 100.0% (112 of 112 strings) TASK: Translated using Weblate (German) Currently translated at 100.0% (112 of 112 strings) Co-authored-by: Yannis Viol Co-authored-by: gallegonovato Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-7-3/de/ Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-7-3/es/ Translation: Neos/Neos.Ui - Main - 7.3 --- Resources/Private/Translations/de/Main.xlf | 4 ++++ Resources/Private/Translations/es/Main.xlf | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Resources/Private/Translations/de/Main.xlf b/Resources/Private/Translations/de/Main.xlf index 3774aea848..c7f16d3cf1 100644 --- a/Resources/Private/Translations/de/Main.xlf +++ b/Resources/Private/Translations/de/Main.xlf @@ -546,6 +546,10 @@ Reload Neos UI Neos UI neu laden + + Add + Einfügen + diff --git a/Resources/Private/Translations/es/Main.xlf b/Resources/Private/Translations/es/Main.xlf index 2aefa1425f..df3ce402ec 100644 --- a/Resources/Private/Translations/es/Main.xlf +++ b/Resources/Private/Translations/es/Main.xlf @@ -502,6 +502,10 @@ Format options Opciones del formato + + Add + Añadir + From 40825d68aea0ca967c1826d893e751bbf90ce91c Mon Sep 17 00:00:00 2001 From: Marc Henry Schultz <85400359+mhsdesign@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:03:54 +0200 Subject: [PATCH 10/10] BUGFIX: Make prop `Dialog.onRequestClose` optional --- packages/react-ui-components/src/Dialog/dialog.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/react-ui-components/src/Dialog/dialog.tsx b/packages/react-ui-components/src/Dialog/dialog.tsx index 1fe0f62500..00ca7a9cad 100644 --- a/packages/react-ui-components/src/Dialog/dialog.tsx +++ b/packages/react-ui-components/src/Dialog/dialog.tsx @@ -30,9 +30,9 @@ export interface DialogProps { readonly isOpen: boolean; /** - * The handler which gets called once the user clicks on the close symbol in the top right corner of the Dialog. + * An optional handler, which gets called once the user clicks on the close symbol in the top right corner of the Dialog. */ - readonly onRequestClose: () => void; + readonly onRequestClose?: () => void; /** * An optional boolean flag to keep the user in the dialog. @@ -99,7 +99,9 @@ class DialogWithOverlay extends PureComponent { this.startShaking(); return false; } - this.props.onRequestClose(); + if (this.props.onRequestClose) { + this.props.onRequestClose(); + } return true; }, };