decap-cms-widget-object 3.3.1 → 3.5.0

package/dist/esm/ObjectControl.js

@@ -1,6 +1,3 @@
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
@@ -24,59 +21,44 @@ const styleStrings = {
   `
 };
 export default class ObjectControl extends React.Component {
+  childRefs = {};
+  processControlRef = ref => {
+    if (!ref) return;
+    const name = ref.props.field.get('name');
+    this.childRefs[name] = ref;
+    this.props.controlRef?.(ref);
+  };
+  static propTypes = {
+    onChangeObject: PropTypes.func.isRequired,
+    onValidateObject: PropTypes.func,
+    value: PropTypes.oneOfType([PropTypes.node, PropTypes.object, PropTypes.bool]),
+    field: PropTypes.object,
+    forID: PropTypes.string,
+    classNameWrapper: PropTypes.string.isRequired,
+    forList: PropTypes.bool,
+    controlRef: PropTypes.func,
+    editorControl: PropTypes.elementType.isRequired,
+    resolveWidget: PropTypes.func.isRequired,
+    clearFieldErrors: PropTypes.func.isRequired,
+    fieldsErrors: ImmutablePropTypes.map,
+    hasError: PropTypes.bool,
+    t: PropTypes.func,
+    locale: PropTypes.string,
+    collapsed: PropTypes.bool
+  };
+  static defaultProps = {
+    value: Map()
+  };
   constructor(props) {
     super(props);
-    _defineProperty(this, "childRefs", {});
-    _defineProperty(this, "processControlRef", ref => {
-      var _this$props$controlRe, _this$props;
-      if (!ref) return;
-      const name = ref.props.field.get('name');
-      this.childRefs[name] = ref;
-      (_this$props$controlRe = (_this$props = this.props).controlRef) === null || _this$props$controlRe === void 0 ? void 0 : _this$props$controlRe.call(_this$props, ref);
-    });
-    _defineProperty(this, "validate", () => {
-      const {
-        field
-      } = this.props;
-      let fields = field.get('field') || field.get('fields');
-      fields = List.isList(fields) ? fields : List([fields]);
-      fields.forEach(field => {
-        var _control$innerWrapped;
-        if (field.get('widget') === 'hidden') return;
-        const name = field.get('name');
-        const control = this.childRefs[name];
-        if (control !== null && control !== void 0 && (_control$innerWrapped = control.innerWrappedControl) !== null && _control$innerWrapped !== void 0 && _control$innerWrapped.validate) {
-          control.innerWrappedControl.validate();
-        } else {
-          var _control$validate;
-          control === null || control === void 0 ? void 0 : (_control$validate = control.validate) === null || _control$validate === void 0 ? void 0 : _control$validate.call(control);
-        }
-      });
-    });
-    _defineProperty(this, "handleCollapseToggle", () => {
-      this.setState({
-        collapsed: !this.state.collapsed
-      });
-    });
-    _defineProperty(this, "renderFields", (multiFields, singleField) => {
-      if (multiFields) {
-        return multiFields.map((f, idx) => this.controlFor(f, idx));
-      }
-      return this.controlFor(singleField);
-    });
-    _defineProperty(this, "objectLabel", () => {
-      const {
-        value,
-        field
-      } = this.props;
-      const label = field.get('label', field.get('name'));
-      const summary = field.get('summary');
-      return summary ? stringTemplate.compileStringTemplate(summary, null, '', value) : label;
-    });
     this.state = {
       collapsed: props.field.get('collapsed', false)
     };
   }
+  componentDidMount() {
+    // Manually validate PropTypes - React 19 breaking change
+    PropTypes.checkPropTypes(ObjectControl.propTypes, this.props, 'prop', 'ObjectControl');
+  }
 
   /*
    * Always update so that each nested widget has the option to update. This is
@@ -87,6 +69,23 @@ export default class ObjectControl extends React.Component {
   shouldComponentUpdate() {
     return true;
   }
+  validate = () => {
+    const {
+      field
+    } = this.props;
+    let fields = field.get('field') || field.get('fields');
+    fields = List.isList(fields) ? fields : List([fields]);
+    fields.forEach(field => {
+      if (field.get('widget') === 'hidden') return;
+      const name = field.get('name');
+      const control = this.childRefs[name];
+      if (control?.innerWrappedControl?.validate) {
+        control.innerWrappedControl.validate();
+      } else {
+        control?.validate?.();
+      }
+    });
+  };
   controlFor(field, key) {
     const {
       value,
@@ -129,6 +128,11 @@ export default class ObjectControl extends React.Component {
       isParentListCollapsed: collapsed
     });
   }
+  handleCollapseToggle = () => {
+    this.setState({
+      collapsed: !this.state.collapsed
+    });
+  };
   focus(path) {
     if (this.state.collapsed) {
       this.setState({
@@ -137,7 +141,7 @@ export default class ObjectControl extends React.Component {
         if (path) {
           const [fieldName, ...remainingPath] = path.split('.');
           const field = this.childRefs[fieldName];
-          if (field !== null && field !== void 0 && field.focus) {
+          if (field?.focus) {
             field.focus(remainingPath.join('.'));
           }
         }
@@ -145,11 +149,26 @@ export default class ObjectControl extends React.Component {
     } else if (path) {
       const [fieldName, ...remainingPath] = path.split('.');
       const field = this.childRefs[fieldName];
-      if (field !== null && field !== void 0 && field.focus) {
+      if (field?.focus) {
         field.focus(remainingPath.join('.'));
       }
     }
   }
+  renderFields = (multiFields, singleField) => {
+    if (multiFields) {
+      return multiFields.map((f, idx) => this.controlFor(f, idx));
+    }
+    return this.controlFor(singleField);
+  };
+  objectLabel = () => {
+    const {
+      value,
+      field
+    } = this.props;
+    const label = field.get('label', field.get('name'));
+    const summary = field.get('summary');
+    return summary ? stringTemplate.compileStringTemplate(summary, null, '', value) : label;
+  };
   render() {
     const {
       field,
@@ -194,25 +213,4 @@ export default class ObjectControl extends React.Component {
     }
     return ___EmotionJSX("h3", null, "No field(s) defined for this widget");
   }
-}
-_defineProperty(ObjectControl, "propTypes", {
-  onChangeObject: PropTypes.func.isRequired,
-  onValidateObject: PropTypes.func,
-  value: PropTypes.oneOfType([PropTypes.node, PropTypes.object, PropTypes.bool]),
-  field: PropTypes.object,
-  forID: PropTypes.string,
-  classNameWrapper: PropTypes.string.isRequired,
-  forList: PropTypes.bool,
-  controlRef: PropTypes.func,
-  editorControl: PropTypes.elementType.isRequired,
-  resolveWidget: PropTypes.func.isRequired,
-  clearFieldErrors: PropTypes.func.isRequired,
-  fieldsErrors: ImmutablePropTypes.map,
-  hasError: PropTypes.bool,
-  t: PropTypes.func,
-  locale: PropTypes.string,
-  collapsed: PropTypes.bool
-});
-_defineProperty(ObjectControl, "defaultProps", {
-  value: Map()
-});
+}

package/dist/esm/ObjectPreview.js

@@ -1,10 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { WidgetPreviewContainer } from 'decap-cms-ui-default';
+import { fromJS } from 'immutable';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 function ObjectPreview({
   field
 }) {
+  if (field && !field.get) {
+    field = fromJS(field);
+  }
   return ___EmotionJSX(WidgetPreviewContainer, null, field && field.get('fields') || field.get('field') || null);
 }
 ObjectPreview.propTypes = {

package/dist/esm/index.js

@@ -1,18 +1,14 @@
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import controlComponent from './ObjectControl';
 import previewComponent from './ObjectPreview';
 import schema from './schema';
 function Widget(opts = {}) {
-  return _objectSpread({
+  return {
     name: 'object',
     controlComponent,
     previewComponent,
-    schema
-  }, opts);
+    schema,
+    ...opts
+  };
 }
 export const DecapCmsWidgetObject = {
   Widget,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-widget-object",
   "description": "Widget for displaying an object of fields for Decap CMS.",
-  "version": "3.3.1",
+  "version": "3.5.0",
   "homepage": "https://www.decapcms.org/docs/widgets/#object",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-widget-object",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -28,8 +28,8 @@
     "immutable": "^3.7.6",
     "lodash": "^4.17.11",
     "prop-types": "^15.7.2",
-    "react": "^18.2.0",
+    "react": "^19.1.0",
     "react-immutable-proptypes": "^2.1.0"
   },
-  "gitHead": "269a14a58fc2af2afe4db5a1eb09300bb3cfe738"
+  "gitHead": "45c9f5b9a1a12f74321ce4658b71ec88d6365ec1"
 }

package/src/ObjectControl.js

@@ -61,6 +61,11 @@ export default class ObjectControl extends React.Component {
     };
   }
 
+  componentDidMount() {
+    // Manually validate PropTypes - React 19 breaking change
+    PropTypes.checkPropTypes(ObjectControl.propTypes, this.props, 'prop', 'ObjectControl');
+  }
+
   /*
    * Always update so that each nested widget has the option to update. This is
    * required because ControlHOC provides a default `shouldComponentUpdate`

package/src/ObjectPreview.js

@@ -1,8 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { WidgetPreviewContainer } from 'decap-cms-ui-default';
+import { fromJS } from 'immutable';
 
 function ObjectPreview({ field }) {
+  if (field && !field.get) {
+    field = fromJS(field);
+  }
   return (
     <WidgetPreviewContainer>
       {(field && field.get('fields')) || field.get('field') || null}