@plone/volto 18.0.0-alpha.26 → 18.0.0-alpha.27

package/CHANGELOG.md

@@ -17,6 +17,13 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.27 (2024-04-05)
+
+### Bugfix
+
+- Enhanced navigation reducer in Volto to keep items extra-data sent from the navigation endpoint @Hrittik20 [#5772](https://github.com/plone/volto/issues/5772)
+- Improve `ColorPickerWidget` typings @sneridagh [#5948](https://github.com/plone/volto/issues/5948)
+
 ## 18.0.0-alpha.26 (2024-04-03)
 
 ### Breaking

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.0.0-alpha.26",
+  "version": "18.0.0-alpha.27",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -237,8 +237,8 @@
     "use-deep-compare-effect": "1.8.1",
     "uuid": "^8.3.2",
     "@plone/registry": "1.5.5",
-    "@plone/scripts": "3.6.1",
-    "@plone/volto-slate": "18.0.0-alpha.11"
+    "@plone/volto-slate": "18.0.0-alpha.11",
+    "@plone/scripts": "3.6.1"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",
@@ -351,8 +351,8 @@
     "webpack-dev-server": "4.11.1",
     "webpack-node-externals": "3.0.0",
     "why": "0.6.2",
-    "@plone/volto-coresandbox": "1.0.0",
-    "@plone/types": "1.0.0-alpha.9"
+    "@plone/types": "1.0.0-alpha.10",
+    "@plone/volto-coresandbox": "1.0.0"
   },
   "volta": {
     "node": "20.9.0"

package/src/components/manage/Widgets/ColorPickerWidget.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Form } from 'semantic-ui-react';
 import { Grid, Button } from 'semantic-ui-react';
-import { isEqual } from 'lodash';
+import { isEmpty, isEqual } from 'lodash';
 import { defineMessages, useIntl } from 'react-intl';
 
 const messages = defineMessages({
@@ -26,11 +26,11 @@ type Color =
 export type ColorPickerWidgetProps = {
   id: string;
   title: string;
-  value: string;
-  default: string;
-  required: boolean;
-  missing_value: unknown;
-  className: string;
+  value?: string;
+  default?: string | object;
+  required?: boolean;
+  missing_value?: unknown;
+  className?: string;
   onChange: (id: string, value: any) => void;
   colors: Color[];
 };
@@ -41,7 +41,7 @@ const ColorPickerWidget = (props: ColorPickerWidgetProps) => {
   const intl = useIntl();
 
   React.useEffect(() => {
-    if (!props.value && props.default) {
+    if (isEmpty(props.value) && props.default) {
       props.onChange(props.id, props.default);
     }
     // Yes, this is correct.

package/src/reducers/navigation/navigation.js

@@ -31,9 +31,8 @@ const initialState = {
  */
 function getRecursiveItems(items) {
   return map(items, (item) => ({
-    title: item.title,
-    description: item.description,
     url: flattenToAppURL(item['@id']),
+    ...item,
     ...(item.items && { items: getRecursiveItems(item.items) }),
   }));
 }

package/src/reducers/navigation/navigation.test.js

@@ -49,6 +49,7 @@ describe('Navigation reducer', () => {
       error: null,
       items: [
         {
+          '@id': 'http://localhost:8080/Plone/front-page',
           title: 'Welcome to Plone!',
           description:
             'Congratulations! You have successfully installed Plone.',
@@ -91,17 +92,20 @@ describe('Navigation reducer', () => {
       error: null,
       items: [
         {
+          '@id': 'http://localhost:8080/Plone/front-page',
           title: 'Welcome to Plone!',
           description:
             'Congratulations! You have successfully installed Plone.',
           url: '/front-page',
         },
         {
+          '@id': 'http://localhost:8080/Plone/folder1',
           title: 'Folder1',
           description: 'Folder description',
           url: '/folder1',
           items: [
             {
+              '@id': 'http://localhost:8080/Plone/folderinfolder1',
               title: 'FolderInFolder1',
               description: 'Sub-folder description',
               url: '/folderinfolder1',
@@ -162,6 +166,7 @@ describe('Navigation reducer (NAVIGATION)GET_CONTENT', () => {
       error: null,
       items: [
         {
+          '@id': 'http://localhost:8080/Plone/front-page',
           title: 'Welcome to Plone!',
           description:
             'Congratulations! You have successfully installed Plone.',
@@ -192,6 +197,7 @@ describe('Navigation reducer (NAVIGATION)GET_CONTENT', () => {
       error: null,
       items: [
         {
+          '@id': 'http://localhost:8080/Plone/front-page',
           title: 'Welcome to Plone!',
           description:
             'Congratulations! You have successfully installed Plone.',

package/types/components/manage/Widgets/ColorPickerWidget.d.ts

@@ -10,11 +10,11 @@ type Color = {
 export type ColorPickerWidgetProps = {
     id: string;
     title: string;
-    value: string;
-    default: string;
-    required: boolean;
-    missing_value: unknown;
-    className: string;
+    value?: string;
+    default?: string | object;
+    required?: boolean;
+    missing_value?: unknown;
+    className?: string;
     onChange: (id: string, value: any) => void;
     colors: Color[];
 };