@plone/volto 18.0.0-alpha.3 → 18.0.0-alpha.5

package/.eslintignore

@@ -0,0 +1 @@
+types/

package/.eslintrc

@@ -34,9 +34,9 @@
       "alias": {
         "map": [
           ["@plone/volto", "./src"],
-          ["@plone/volto-slate", "./packages/volto-slate/src"],
-          ["@plone/registry", "./packages/registry/src"],
-          ["@plone/types", "./packages/types"],
+          ["@plone/volto-slate", "../volto-slate/src"],
+          ["@plone/registry", "../registry/src"],
+          ["@plone/types", "../types"],
           ["@package", "./src"],
           ["@root", "./src"]
         ],

package/.prettierignore

@@ -0,0 +1,8 @@
+**/.next
+**/build
+**/coverage
+**/dist
+styles/rules/*
+node_modules
+./types/*
+locales

package/.prettierrc

@@ -0,0 +1,12 @@
+{
+  "trailingComma": "all",
+  "singleQuote": true,
+  "overrides": [
+    {
+      "files": "*.overrides",
+      "options": {
+        "parser": "less"
+      }
+    }
+  ]
+}

package/{packages/registry/.release-it.json → .release-it.json}

@@ -1,22 +1,28 @@
 {
+  "plugins": {
+    "../scripts/prepublish.js": {}
+  },
   "hooks": {
+    "before:bump": ["pnpm i18n"],
     "after:bump": [
       "pipx run towncrier build --draft --yes --version ${version} > .changelog.draft && pipx run towncrier build --yes --version ${version}",
-      "yarn build"
+      "make copyreleasenotestodocs",
+      "pnpm build:types"
     ],
     "after:release": "rm .changelog.draft"
   },
+  "npm": {
+    "publish": false
+  },
   "git": {
+    "commitArgs": ["--no-verify"],
     "changelog": "pipx run towncrier build --draft --yes --version 0.0.0",
     "requireUpstream": false,
-    "requireCleanWorkingDir": false,
-    "commitMessage": "Release @plone/registry ${version}",
-    "tagName": "plone-registry-${version}",
-    "tagAnnotation": "Release @plone/registry ${version}"
+    "requireCleanWorkingDir": false
   },
   "github": {
     "release": true,
-    "releaseName": "@plone/registry ${version}",
+    "releaseName": "${version}",
     "releaseNotes": "cat .changelog.draft"
   }
 }

package/CHANGELOG.md

@@ -9,14 +9,60 @@ myst:
 
 # Volto Release Notes
 
-<!-- You should *NOT* be adding new change log entries to this file.
-     You should create a file in the news directory instead.
-     For helpful instructions, please see:
-     https://6.docs.plone.org/contributing/index.html#contributing-change-log-label
+<!-- Do *NOT* add new change log entries to this file.
+     Instead create a file in the news directory.
+     For helpful instructions, see:
+     https://6.docs.plone.org/contributing/index.html#change-log-entry
 -->
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.5 (2023-12-13)
+
+### Feature
+
+- Added conditional variations support. @sneridagh @robgietema [#5424](https://github.com/plone/volto/issues/5424)
+- Added `navRoot` and `contentType` to `restricted` key in blocks configuration. @sneridagh [#5517](https://github.com/plone/volto/issues/5517)
+- Add support for `preview_image_link` behavior in Volto Image component @sneridagh [#5523](https://github.com/plone/volto/issues/5523)
+
+### Internal
+
+- Add missing dependency on jsdom @sneridagh [#5490](https://github.com/plone/volto/issues/5490)
+- Fix cypress artifacts path in acceptance tests. @davisagli [#5498](https://github.com/plone/volto/issues/5498)
+- Make sure that the dependencies are built and available on all processes @sneridagh [#5514](https://github.com/plone/volto/issues/5514)
+
+### Documentation
+
+- Less comment blocks must have `*` as the first character on the second and subsequent lines, else the Pygments lexer fails. @stevepiercy [#5500](https://github.com/plone/volto/issues/5500)
+- Revert #5500. See #5499 for actual cause of Pygments failure. @stevepiercy [#5504](https://github.com/plone/volto/issues/5504)
+- Clarified where to run Make commands for building documentation. @stevepiercy [#5505](https://github.com/plone/volto/issues/5505)
+- Changed installation of Vale from manual to automatic via `make docs-vale`. @stevepiercy [#5508](https://github.com/plone/volto/issues/5508)
+
+## 18.0.0-alpha.4 (2023-12-02)
+
+### Feature
+
+- New monorepo @sneridagh [#5409](https://github.com/plone/volto/issues/5409)
+
+### Bugfix
+
+- Fix the right order of parameters in normalizeExternalData.js @dobri1408 [#5347](https://github.com/plone/volto/issues/5347)
+- Initialize data in form before the checks for the `blocks` and `blocks_layout` are done This fix an edge case when the data from the server content is empty, then the fields are populated, but the initialized data is snapshot after the check (and amendments) are done. @sneridagh [#5445](https://github.com/plone/volto/issues/5445)
+- Replaced `toNumber` with `parseFloat` to avoid an error when validating the `plone.restapi` version. @shibbu264 [#5448](https://github.com/plone/volto/issues/5448)
+- Initialize only the development addons present in `compilerOptions.paths` filtered by the add-ons registered @sneridagh [#5463](https://github.com/plone/volto/issues/5463)
+
+### Internal
+
+- Cleaned up Registry and renamed `packagesFolderAddons` to `coreAddons`. @sneridagh [#5464](https://github.com/plone/volto/issues/5464)
+- Deleted wrongly placed news items, added a check for them, issue a nice message in CI @sneridagh [#5470](https://github.com/plone/volto/issues/5470)
+
+### Documentation
+
+- Fixed broken links after monorepo merge. @stevepiercy [#5459](https://github.com/plone/volto/issues/5459)
+- Added `volto-generator` compatibility with Volto to documentation. @stevepiercy [#5467](https://github.com/plone/volto/issues/5467)
+- Updated the symlink from `docs/source/news` to point to `packages/volto/news`. @stevepiercy [#5471](https://github.com/plone/volto/issues/5471)
+- Remove outdated note from upgrade guide for 17 related to ipv6 preferred by Node 18 @sneridagh [#5481](https://github.com/plone/volto/issues/5481)
+
 ## 18.0.0-alpha.3 (2023-11-27)
 
 ### Feature

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.0.0-alpha.3",
+  "version": "18.0.0-alpha.5",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -27,42 +27,13 @@
     "plone",
     "react"
   ],
-  "packagesFolderAddons": {
+  "coreAddons": {
     "volto-slate": {
       "package": "@plone/volto-slate"
     }
   },
+  "main": "src/index.js",
   "types": "types/index.d.ts",
-  "scripts": {
-    "postinstall": "make patches",
-    "analyze": "BUNDLE_ANALYZE=true razzle build",
-    "start": "razzle start",
-    "start:coresandbox": "ADDONS=coresandbox razzle start",
-    "build": "razzle build --noninteractive",
-    "build:types": "tsc src/**/*.{js,jsx} --declaration --allowJs --emitDeclarationOnly --outDir types --skipLibCheck",
-    "prepare": "husky install",
-    "test": "razzle test --maxWorkers=50%",
-    "test:ci": "CI=true NODE_ICU_DATA=node_modules/full-icu razzle test",
-    "test:husky": "CI=true yarn test --bail --findRelatedTests",
-    "test:debug": "node --inspect node_modules/.bin/jest --runInBand",
-    "start:prod": "NODE_ENV=production node build/server.js",
-    "prettier": "./node_modules/.bin/prettier --single-quote --check '{src,cypress}/**/*.{js,jsx,ts,tsx}' --check '*.js'",
-    "prettier:fix": "./node_modules/.bin/prettier --single-quote --write '{src,cypress}/**/*.{js,jsx,ts,tsx}' --write '*.js'",
-    "stylelint": "./node_modules/.bin/stylelint 'theme/**/*.{css,less}' 'src/**/*.{css,less}'",
-    "stylelint:overrides": "./node_modules/.bin/stylelint 'theme/**/*.overrides' 'src/**/*.overrides'",
-    "stylelint:fix": "yarn stylelint --fix && yarn stylelint:overrides --fix",
-    "lint": "./node_modules/eslint/bin/eslint.js --max-warnings=0 'src/**/*.{js,jsx,ts,tsx,json}'",
-    "lint:fix": "./node_modules/eslint/bin/eslint.js --fix 'src/**/*.{js,jsx,ts,tsx,json}'",
-    "i18n": "rm -rf build/messages && NODE_ENV=production node packages/scripts/i18n.cjs",
-    "i18n:ci": "yarn i18n && git diff -G'^[^\"POT]' --exit-code",
-    "typecheck": "tsc --project tsconfig.json --noEmit",
-    "dry-release": "release-it --dry-run",
-    "release": "release-it",
-    "release-major-alpha": "release-it major --preRelease=alpha",
-    "release-alpha": "release-it --preRelease=alpha",
-    "storybook": "start-storybook -p 6006",
-    "build-storybook": "build-storybook"
-  },
   "bundlewatch": {
     "files": [
       {
@@ -72,9 +43,6 @@
     ]
   },
   "jest": {
-    "modulePathIgnorePatterns": [
-      "api"
-    ],
     "transform": {
       "^.+\\.js(x)?$": "babel-jest",
       "^.+\\.ts(x)?$": "ts-jest",
@@ -86,9 +54,9 @@
       "@plone/volto/package.json": "<rootDir>/package.json",
       "@plone/volto/babel": "<rootDir>/babel.js",
       "@plone/volto/(.*)$": "<rootDir>/src/$1",
-      "@plone/volto-slate/(.*)$": "<rootDir>/packages/volto-slate/src/$1",
-      "@plone/registry": "<rootDir>/packages/registry/src",
-      "@plone/registry/(.*)$": "<rootDir>/packages/registry/src/$1",
+      "@plone/volto-slate/(.*)$": "<rootDir>/../volto-slate/src/$1",
+      "@plone/registry": "<rootDir>/../registry/src",
+      "@plone/registry/(.*)$": "<rootDir>/../registry/src/$1",
       "~/config": "<rootDir>/src/config",
       "~/../locales/${lang}.json": "<rootDir>/locales/en.json",
       "(.*)/locales/(.*)": "<rootDir>/locales/$2",
@@ -116,23 +84,8 @@
       "__DEV__": true
     },
     "testMatch": [
-      "<rootDir>/src/**/__tests__/**/*.{js,jsx,mjs,ts,tsx}",
-      "<rootDir>/src/**/?(*.)(spec|test).{js,jsx,mjs,ts,tsx}",
       "<rootDir>/__tests__/**/?(*.)(spec|test).{js,jsx,mjs,ts,tsx}",
-      "<rootDir>/packages/volto-slate/src/**/?(*.)(spec|test).{js,jsx,mjs,ts,tsx}",
-      "<rootDir>/packages/registry/src/**/?(*.)(spec|test).{js,jsx,mjs,ts,tsx}"
-    ]
-  },
-  "prettier": {
-    "trailingComma": "all",
-    "singleQuote": true,
-    "overrides": [
-      {
-        "files": "*.overrides",
-        "options": {
-          "parser": "less"
-        }
-      }
+      "<rootDir>/../**/?(*.)(spec|test).{js,jsx,mjs,ts,tsx}"
     ]
   },
   "stylelint": {
@@ -185,52 +138,6 @@
     "not ie 11",
     "not dead"
   ],
-  "release-it": {
-    "hooks": {
-      "before:bump": [
-        "yarn i18n"
-      ],
-      "after:bump": [
-        "pipx run towncrier build --draft --yes --version ${version} > .changelog.draft && pipx run towncrier build --yes --version ${version}",
-        "make corepackagebump VERSION=${version}",
-        "make copyreleasenotestodocs",
-        "yarn build:types"
-      ],
-      "after:release": "rm .changelog.draft"
-    },
-    "git": {
-      "changelog": "pipx run towncrier build --draft --yes --version 0.0.0",
-      "requireUpstream": false,
-      "requireCleanWorkingDir": false
-    },
-    "github": {
-      "release": true,
-      "releaseName": "${version}",
-      "releaseNotes": "cat .changelog.draft"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,jsx,ts,tsx,json}": [
-      "npx eslint --max-warnings=0 --fix",
-      "npx prettier --single-quote --write",
-      "yarn test:husky"
-    ],
-    "src/**/*.{jsx}": [
-      "yarn i18n"
-    ],
-    "theme/**/*.{css,less}": [
-      "npx stylelint --fix"
-    ],
-    "src/**/*.{css,less}": [
-      "npx stylelint --fix"
-    ],
-    "theme/**/*.overrides": [
-      "npx stylelint --fix"
-    ],
-    "src/**/*.overrides": [
-      "npx stylelint --fix"
-    ]
-  },
   "engines": {
     "node": "^16 || ^18 || ^20"
   },
@@ -249,11 +156,6 @@
     "@loadable/component": "5.14.1",
     "@loadable/server": "5.14.0",
     "@loadable/webpack-plugin": "5.15.2",
-    "@plone/scripts": "3.0.1",
-    "@testing-library/cypress": "9.0.0",
-    "@testing-library/jest-dom": "5.16.4",
-    "@testing-library/react": "12.1.5",
-    "@testing-library/react-hooks": "8.0.1",
     "autoprefixer": "10.4.8",
     "axe-core": "4.4.2",
     "babel-plugin-add-module-exports": "0.2.1",
@@ -267,9 +169,6 @@
     "connected-react-router": "6.8.0",
     "crypto-random-string": "3.2.0",
     "css-loader": "5.2.7",
-    "cypress": "13.1.0",
-    "cypress-axe": "1.5.0",
-    "cypress-file-upload": "5.0.8",
     "debug": "4.3.2",
     "decorate-component-with-props": "1.2.1",
     "deep-freeze": "0.0.1",
@@ -302,7 +201,6 @@
     "hoist-non-react-statics": "3.3.2",
     "html-webpack-plugin": "5.5.0",
     "http-proxy-middleware": "2.0.1",
-    "husky": "8.0.1",
     "identity-obj-proxy": "3.0.0",
     "image-extensions": "1.1.0",
     "immutable": "3",
@@ -335,6 +233,7 @@
     "prettier": "3.0.3",
     "pretty-bytes": "5.3.0",
     "prismjs": "1.27.0",
+    "process": "^0.11.10",
     "promise-file-reader": "1.0.2",
     "prop-types": "15.7.2",
     "query-string": "7.1.0",
@@ -360,6 +259,7 @@
     "react-intl": "3.8.0",
     "react-intl-redux": "2.2.0",
     "react-medium-image-zoom": "3.0.15",
+    "react-popper": "^2.3.0",
     "react-portal": "4.2.1",
     "react-redux": "7.2.4",
     "react-router": "5.2.0",
@@ -404,15 +304,20 @@
     "undoo": "0.5.0",
     "universal-cookie": "4.0.4",
     "universal-cookie-express": "4.0.3",
+    "url": "^0.11.3",
     "use-deep-compare-effect": "1.8.1",
     "uuid": "^8.3.2",
     "webpack": "5.76.1",
     "webpack-dev-server": "4.11.1",
     "webpack-node-externals": "3.0.0",
     "xmlrpc": "1.3.2",
-    "yarnhook": "0.6.1"
+    "yarnhook": "0.5.1",
+    "@plone/registry": "1.1.0",
+    "@plone/scripts": "3.1.0",
+    "@plone/volto-slate": "18.0.0-alpha.5"
   },
   "devDependencies": {
+    "@jest/globals": "^29.7.0",
     "@storybook/addon-actions": "^6.5.15",
     "@storybook/addon-controls": "6.5.15",
     "@storybook/addon-essentials": "^6.5.15",
@@ -420,15 +325,26 @@
     "@storybook/builder-webpack5": "^6.5.15",
     "@storybook/manager-webpack5": "^6.5.15",
     "@storybook/react": "^6.5.15",
+    "@testing-library/cypress": "9.0.0",
+    "@testing-library/jest-dom": "5.16.4",
+    "@testing-library/react": "12.1.5",
+    "@testing-library/react-hooks": "8.0.1",
+    "@types/jest": "^29.5.8",
+    "@types/react": "^17.0.52",
+    "@types/react-dom": "^17",
     "@types/react-test-renderer": "18.0.1",
     "@typescript-eslint/eslint-plugin": "6.7.0",
     "@typescript-eslint/parser": "6.7.0",
     "babel-loader": "9.1.0",
     "bundlewatch": "0.3.3",
+    "cypress": "13.1.0",
+    "cypress-axe": "1.5.0",
+    "cypress-file-upload": "5.0.8",
     "full-icu": "1.4.0",
     "identity-obj-proxy": "3.0.0",
     "jest": "26.6.3",
     "jest-environment-jsdom": "^26",
+    "jsdom": "^16.7.0",
     "jsonwebtoken": "9.0.0",
     "react-error-overlay": "6.0.9",
     "react-is": "^16.13.1",
@@ -439,24 +355,41 @@
     "ts-loader": "9.4.4",
     "typescript": "5.2.2",
     "use-trace-update": "1.3.2",
-    "why": "0.6.2"
-  },
-  "resolutions-comments": {
-    "ua-parser-js": "See https://github.com/faisalman/ua-parser-js/issues/536",
-    "@typescript-eslint/eslint-plugin": "ESlint support for TypeScript 5.2.0 needs these versions"
-  },
-  "resolutions": {
-    "clean-css": "5.3.1",
-    "http-proxy": "^1.18.1",
-    "react-dev-utils": "^12",
-    "react-error-overlay": "6.0.9",
-    "ua-parser-js": "0.7.28",
-    "webpack-bundle-analyzer": "4.9.1",
-    "@typescript-eslint/eslint-plugin": "6.7.0",
-    "@typescript-eslint/parser": "6.7.0"
+    "wait-on": "6.0.0",
+    "why": "0.6.2",
+    "@plone/volto-coresandbox": "1.0.0"
   },
   "volta": {
     "node": "20.9.0"
   },
-  "packageManager": "yarn@3.2.3"
-}
+  "scripts": {
+    "analyze": "BUNDLE_ANALYZE=true razzle build",
+    "start": "razzle start",
+    "start:coresandbox": "ADDONS=coresandbox razzle start",
+    "build": "razzle build --noninteractive",
+    "build:types": "tsc src/**/*.{js,jsx} --declaration --allowJs --emitDeclarationOnly --outDir types --skipLibCheck",
+    "test": "razzle test --maxWorkers=50%",
+    "test:ci": "CI=true NODE_ICU_DATA=node_modules/full-icu razzle test",
+    "test:husky": "CI=true yarn test --bail --findRelatedTests",
+    "test:debug": "node --inspect node_modules/.bin/jest --runInBand",
+    "start:prod": "NODE_ENV=production node build/server.js",
+    "prettier": "./node_modules/.bin/prettier --single-quote --check '{src,cypress}/**/*.{js,jsx,ts,tsx}' --check '*.js'",
+    "prettier:fix": "./node_modules/.bin/prettier --single-quote --write '{src,cypress}/**/*.{js,jsx,ts,tsx}' --write '*.js'",
+    "prettier:husky": "prettier --single-quote --write",
+    "stylelint": "./node_modules/.bin/stylelint 'theme/**/*.{css,less}' 'src/**/*.{css,less}'",
+    "stylelint:overrides": "./node_modules/.bin/stylelint 'theme/**/*.overrides' 'src/**/*.overrides'",
+    "stylelint:fix": "yarn stylelint --fix && yarn stylelint:overrides --fix",
+    "lint": "./node_modules/eslint/bin/eslint.js --max-warnings=0 'src/**/*.{js,jsx,ts,tsx,json}'",
+    "lint:fix": "./node_modules/eslint/bin/eslint.js --fix 'src/**/*.{js,jsx,ts,tsx,json}'",
+    "lint:husky": "eslint --max-warnings=0 --fix",
+    "i18n": "rm -rf build/messages && NODE_ENV=production i18n",
+    "i18n:ci": "pnpm i18n && git diff -G'^[^\"POT]' --exit-code",
+    "typecheck": "tsc --project tsconfig.json --noEmit",
+    "dry-release": "release-it --dry-run",
+    "release": "release-it",
+    "release-major-alpha": "release-it major --preRelease=alpha",
+    "release-alpha": "release-it --preRelease=alpha",
+    "storybook": "start-storybook -p 6006",
+    "build-storybook": "build-storybook"
+  }
+}

package/razzle.config.js

@@ -7,9 +7,10 @@ const LodashModuleReplacementPlugin = require('lodash-webpack-plugin');
 const fs = require('fs');
 const RootResolverPlugin = require('./webpack-plugins/webpack-root-resolver');
 const RelativeResolverPlugin = require('./webpack-plugins/webpack-relative-resolver');
-const createAddonsLoader = require('./packages/registry/create-addons-loader');
-const createThemeAddonsLoader = require('./packages/registry/create-theme-addons-loader');
-const AddonConfigurationRegistry = require('./packages/registry/addon-registry');
+const { poToJson } = require('@plone/scripts/i18n.cjs');
+const createAddonsLoader = require('@plone/registry/src/create-addons-loader');
+const createThemeAddonsLoader = require('@plone/registry/src/create-theme-addons-loader');
+const AddonConfigurationRegistry = require('@plone/registry/src/addon-registry');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
@@ -19,7 +20,6 @@ const fileLoaderFinder = makeLoaderFinder('file-loader');
 
 const projectRootPath = path.resolve('.');
 const languages = require('./src/constants/Languages');
-const { poToJson } = require('./packages/scripts/i18n.cjs');
 
 const packageJson = require(path.join(projectRootPath, 'package.json'));
 
@@ -232,7 +232,6 @@ const defaultModify = ({
     'load-volto-addons': addonsLoaderPath,
     ...registry.getResolveAliases(),
     '@plone/volto': `${registry.voltoPath}/src`,
-    '@plone/registry': `${registry.voltoPath}/packages/registry/src`,
     // to be able to reference path uncustomized by webpack
     '@plone/volto-original': `${registry.voltoPath}/src`,
     // be able to reference current package from customized package
@@ -275,8 +274,6 @@ const defaultModify = ({
     include.push(fs.realpathSync(`${registry.voltoPath}/src`));
   }
 
-  include.push(fs.realpathSync(`${registry.voltoPath}/packages/registry/src`));
-
   // Add babel support external (ie. node_modules npm published packages)
   const packagesNames = Object.keys(registry.packages);
   if (registry.packages && packagesNames.length > 0) {

package/src/components/manage/Add/Add.jsx

@@ -315,6 +315,9 @@ class Add extends Component {
           <Form
             ref={this.form}
             key="translated-or-new-content-form"
+            navRoot={
+              this.props.content?.['@components']?.navroot?.navroot || {}
+            }
             schema={this.props.schema}
             type={this.props.type}
             formData={{
@@ -334,6 +337,9 @@ class Add extends Component {
               // Copy the Language Independent Fields values from the to-be translated content
               // into the default values of the translated content Add form.
               ...lifData(),
+              parent: {
+                '@id': this.props.content?.['@id'] || '',
+              },
             }}
             requestError={this.state.error}
             onSubmit={this.onSubmit}

package/src/components/manage/BlockChooser/BlockChooser.jsx

@@ -31,6 +31,8 @@ const BlockChooser = ({
   blocksConfig = config.blocks.blocksConfig,
   blockChooserRef,
   properties = {},
+  navRoot,
+  contentType,
 }) => {
   const intl = useIntl();
   const hasAllowedBlocks = !isEmpty(allowedBlocks);
@@ -55,7 +57,7 @@ const BlockChooser = ({
         // depending on this function, given properties (current present blocks) and the
         // block being evaluated
         return typeof item.restricted === 'function'
-          ? !item.restricted({ properties, block: item })
+          ? !item.restricted({ properties, block: item, navRoot, contentType })
           : !item.restricted;
       }
     }

package/src/components/manage/BlockChooser/BlockChooserButton.jsx

@@ -54,7 +54,10 @@ const BlockChooserButton = (props) => {
     blocksConfig,
     buttonComponent,
     properties,
+    navRoot,
+    contentType,
   } = props;
+
   const { disableNewBlocks } = data;
   const [addNewBlockOpened, setAddNewBlockOpened] = React.useState(false);
 
@@ -142,6 +145,8 @@ const BlockChooserButton = (props) => {
               properties={properties}
               showRestricted={showRestricted}
               ref={blockChooserRef}
+              navRoot={navRoot}
+              contentType={contentType}
             />
           </div>
         </Portal>

package/src/components/manage/Blocks/Block/BlocksForm.jsx

@@ -28,6 +28,8 @@ const BlocksForm = (props) => {
     pathname,
     onChangeField,
     properties,
+    type,
+    navRoot,
     onChangeFormData,
     selectedBlock,
     multiSelected,
@@ -260,6 +262,8 @@ const BlocksForm = (props) => {
               pathname,
               metadata,
               properties,
+              contentType: type,
+              navRoot,
               blocksConfig,
               selected: selectedBlock === childId,
               multiSelected: multiSelected?.includes(childId),

package/src/components/manage/Blocks/Block/DefaultEdit.jsx

@@ -7,7 +7,7 @@ import DefaultBlockView from './DefaultView';
 
 const DefaultBlockEdit = (props) => {
   const { blocksConfig = config.blocks.blocksConfig } = props;
-  const { data, onChangeBlock, block, selected } = props;
+  const { data, onChangeBlock, block, selected, navRoot, contentType } = props;
   const intl = useIntl();
   const blockSchema = blocksConfig?.[data['@type']]?.blockSchema;
   const schema =
@@ -32,6 +32,8 @@ const DefaultBlockEdit = (props) => {
               });
             }}
             formData={data}
+            navRoot={navRoot}
+            contentType={contentType}
           />
         </SidebarPortal>
       ) : (

package/src/components/manage/Blocks/Block/EditBlockWrapper.jsx

@@ -47,7 +47,10 @@ const EditBlockWrapper = (props) => {
     editable,
     properties,
     showBlockChooser,
+    navRoot,
+    contentType,
   } = blockProps;
+
   const visible = selected && !hideHandler(data);
 
   const required = isBoolean(data.required)
@@ -107,6 +110,8 @@ const EditBlockWrapper = (props) => {
               blocksConfig={blocksConfig}
               size="24px"
               properties={properties}
+              navRoot={navRoot}
+              contentType={contentType}
             />
           )}
         </div>

package/src/components/manage/Blocks/Block/Settings.jsx

@@ -3,7 +3,14 @@ import PropTypes from 'prop-types';
 import { injectIntl } from 'react-intl';
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 
-const Settings = ({ data, block, onChangeBlock, schema }) => {
+const Settings = ({
+  data,
+  block,
+  onChangeBlock,
+  schema,
+  navRoot,
+  contentType,
+}) => {
   return (
     <BlockDataForm
       schema={schema}
@@ -17,6 +24,8 @@ const Settings = ({ data, block, onChangeBlock, schema }) => {
       onChangeBlock={onChangeBlock}
       formData={data}
       applySchemaEnhancers={false}
+      navRoot={navRoot}
+      contentType={contentType}
     />
   );
 };

package/src/components/manage/Blocks/Container/Data.jsx

@@ -2,7 +2,8 @@ import { useIntl } from 'react-intl';
 import { BlockDataForm } from '@plone/volto/components';
 
 const ContainerData = (props) => {
-  const { block, blocksConfig, data, onChangeBlock } = props;
+  const { block, blocksConfig, data, onChangeBlock, navRoot, contentType } =
+    props;
   const intl = useIntl();
 
   const schema = blocksConfig[data['@type']].blockSchema({ intl });
@@ -25,6 +26,8 @@ const ContainerData = (props) => {
       block={block}
       onChangeBlock={onChangeBlock}
       blocksConfig={blocksConfig}
+      navRoot={navRoot}
+      contentType={contentType}
     />
   );
 };