decap-cms-widget-list 3.4.0 → 3.6.0

package/dist/esm/schema.js

@@ -3,6 +3,12 @@ export default {
     allow_add: {
       type: 'boolean'
     },
+    allow_remove: {
+      type: 'boolean'
+    },
+    allow_reorder: {
+      type: 'boolean'
+    },
     collapsed: {
       type: 'boolean'
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-widget-list",
   "description": "Widget for editing lists in Decap CMS.",
-  "version": "3.4.0",
+  "version": "3.6.0",
   "homepage": "https://www.decapcms.org/docs/widgets/#list",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-widget-list",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -23,7 +23,8 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^6.0.1",
-    "@dnd-kit/sortable": "^7.0.2"
+    "@dnd-kit/sortable": "^7.0.2",
+    "@dnd-kit/utilities": "^3.2.2"
   },
   "peerDependencies": {
     "@emotion/react": "^11.11.1",
@@ -37,5 +38,5 @@
     "react": "^19.1.0",
     "react-immutable-proptypes": "^2.1.0"
   },
-  "gitHead": "ed7e99318007b83f4c57f3237bf92b931676820a"
+  "gitHead": "567a80101f4846853701ad7d8abdc29b5e4fab56"
 }

package/src/ListControl.js

@@ -7,7 +7,6 @@ import { List, Map, fromJS } from 'immutable';
 import partial from 'lodash/partial';
 import isEmpty from 'lodash/isEmpty';
 import uniqueId from 'lodash/uniqueId';
-import { v4 as uuid } from 'uuid';
 import DecapCmsWidgetObject from 'decap-cms-widget-object';
 import {
   DndContext,
@@ -211,7 +210,7 @@ export default class ListControl extends React.Component {
     const { field, value } = props;
     const listCollapsed = field.get('collapsed', true);
     const itemsCollapsed = (value && Array(value.size).fill(listCollapsed)) || [];
-    const keys = (value && Array.from({ length: value.size }, () => uuid())) || [];
+    const keys = (value && Array.from({ length: value.size }, () => crypto.randomUUID())) || [];
 
     this.state = {
       listCollapsed,
@@ -353,7 +352,7 @@ export default class ListControl extends React.Component {
     const { value, onChange, field } = this.props;
     const addToTop = field.get('add_to_top', false);
 
-    const itemKey = uuid();
+    const itemKey = crypto.randomUUID();
     this.setState({
       itemsCollapsed: addToTop
         ? [false, ...this.state.itemsCollapsed]
@@ -682,6 +681,8 @@ export default class ListControl extends React.Component {
           onCollapseToggle={partial(this.handleItemCollapseToggle, index)}
           dragHandle={DragHandle}
           id={key}
+          allowRemove={field.get('allow_remove', true)}
+          allowReorder={field.get('allow_reorder', true)}
           onRemove={partial(this.handleRemove, index)}
           data-testid={`styled-list-item-top-bar-${key}`}
         />

package/src/__tests__/ListControl.spec.js

@@ -34,7 +34,6 @@ jest.mock('decap-cms-ui-default', () => {
     ListItemTopBar,
   };
 });
-jest.mock('uuid');
 
 describe('ListControl', () => {
   const props = {
@@ -63,9 +62,8 @@ describe('ListControl', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
-    const uuid = require('uuid');
     let id = 0;
-    uuid.v4.mockImplementation(() => {
+    global.crypto.randomUUID = jest.fn(() => {
       return id++;
     });
   });

package/src/__tests__/__snapshots__/ListControl.spec.js.snap

@@ -162,6 +162,7 @@ exports[`ListControl should add to list when add button is clicked 1`] = `
         class="emotion-3 emotion-4"
       >
         <button
+          aria-label="editor.editorWidgets.object.collapse"
           class="emotion-5 emotion-6"
           data-testid="expand-button"
         >
@@ -204,6 +205,8 @@ exports[`ListControl should add to list when add button is clicked 1`] = `
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           data-testid="styled-list-item-top-bar-0"
           id="0"
@@ -412,6 +415,7 @@ exports[`ListControl should remove from list when remove button is clicked 1`] =
         class="emotion-3 emotion-4"
       >
         <button
+          aria-label="editor.editorWidgets.object.collapse"
           class="emotion-5 emotion-6"
           data-testid="expand-button"
         >
@@ -454,6 +458,8 @@ exports[`ListControl should remove from list when remove button is clicked 1`] =
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           data-testid="styled-list-item-top-bar-0"
           id="0"
@@ -482,6 +488,8 @@ exports[`ListControl should remove from list when remove button is clicked 1`] =
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           data-testid="styled-list-item-top-bar-1"
           id="1"
@@ -690,6 +698,7 @@ exports[`ListControl should remove from list when remove button is clicked 2`] =
         class="emotion-3 emotion-4"
       >
         <button
+          aria-label="editor.editorWidgets.object.collapse"
           class="emotion-5 emotion-6"
           data-testid="expand-button"
         >
@@ -732,6 +741,8 @@ exports[`ListControl should remove from list when remove button is clicked 2`] =
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           collapsed=""
           data-testid="styled-list-item-top-bar-1"
@@ -953,6 +964,7 @@ exports[`ListControl should render list with fields with collapse = "false" and
         class="emotion-3 emotion-4"
       >
         <button
+          aria-label="editor.editorWidgets.object.collapse"
           class="emotion-5 emotion-6"
           data-testid="expand-button"
         >
@@ -995,6 +1007,8 @@ exports[`ListControl should render list with fields with collapse = "false" and
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           data-testid="styled-list-item-top-bar-0"
           id="0"
@@ -1023,6 +1037,8 @@ exports[`ListControl should render list with fields with collapse = "false" and
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           data-testid="styled-list-item-top-bar-1"
           id="1"
@@ -1231,6 +1247,7 @@ exports[`ListControl should render list with fields with collapse = "false" and
         class="emotion-3 emotion-4"
       >
         <button
+          aria-label="editor.editorWidgets.object.collapse"
           class="emotion-5 emotion-6"
           data-testid="expand-button"
         >
@@ -1273,6 +1290,8 @@ exports[`ListControl should render list with fields with collapse = "false" and
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           data-testid="styled-list-item-top-bar-0"
           id="0"
@@ -1301,6 +1320,8 @@ exports[`ListControl should render list with fields with collapse = "false" and
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           data-testid="styled-list-item-top-bar-1"
           id="1"
@@ -1509,6 +1530,7 @@ exports[`ListControl should render list with fields with default collapse ("true
         class="emotion-3 emotion-4"
       >
         <button
+          aria-label="editor.editorWidgets.object.expand"
           class="emotion-5 emotion-6"
           data-testid="expand-button"
         >
@@ -1551,6 +1573,8 @@ exports[`ListControl should render list with fields with default collapse ("true
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           collapsed=""
           data-testid="styled-list-item-top-bar-0"
@@ -1581,6 +1605,8 @@ exports[`ListControl should render list with fields with default collapse ("true
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           collapsed=""
           data-testid="styled-list-item-top-bar-1"
@@ -1770,6 +1796,7 @@ exports[`ListControl should render list with fields with default collapse ("true
         class="emotion-3 emotion-4"
       >
         <button
+          aria-label="editor.editorWidgets.object.expand"
           class="emotion-5 emotion-6"
           data-testid="expand-button"
         >
@@ -1973,6 +2000,7 @@ exports[`ListControl should render list with nested object 1`] = `
         class="emotion-3 emotion-4"
       >
         <button
+          aria-label="editor.editorWidgets.object.expand"
           class="emotion-5 emotion-6"
           data-testid="expand-button"
         >
@@ -2015,6 +2043,8 @@ exports[`ListControl should render list with nested object 1`] = `
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           collapsed=""
           data-testid="styled-list-item-top-bar-0"
@@ -2045,6 +2075,8 @@ exports[`ListControl should render list with nested object 1`] = `
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           collapsed=""
           data-testid="styled-list-item-top-bar-1"
@@ -2255,6 +2287,7 @@ exports[`ListControl should render list with nested object with collapse = false
         class="emotion-3 emotion-4"
       >
         <button
+          aria-label="editor.editorWidgets.object.collapse"
           class="emotion-5 emotion-6"
           data-testid="expand-button"
         >
@@ -2297,6 +2330,8 @@ exports[`ListControl should render list with nested object with collapse = false
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           data-testid="styled-list-item-top-bar-0"
           id="0"
@@ -2325,6 +2360,8 @@ exports[`ListControl should render list with nested object with collapse = false
         class="emotion-15 emotion-16"
       >
         <mock-list-item-top-bar
+          allowremove=""
+          allowreorder=""
           class="emotion-17 emotion-18"
           data-testid="styled-list-item-top-bar-1"
           id="1"

package/src/schema.js

@@ -1,6 +1,8 @@
 export default {
   properties: {
     allow_add: { type: 'boolean' },
+    allow_remove: { type: 'boolean' },
+    allow_reorder: { type: 'boolean' },
     collapsed: { type: 'boolean' },
     summary: { type: 'string' },
     minimize_collapsed: { type: 'boolean' },