FIX JS Console errors and warnings

silverstripe · Mar 4, 2024 · 1df1ee7 · 1df1ee7
1 parent 0c5de61
commit 1df1ee7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/SearchableDropdownField/SearchableDropdownField.js b/client/src/components/SearchableDropdownField/SearchableDropdownField.js
@@ -166,12 +166,12 @@ SearchableDropdownField.propTypes = {
   multi: PropTypes.bool.isRequired,
   name: PropTypes.string.isRequired,
   placeholder: PropTypes.string.isRequired,
-  onChange: PropTypes.func.isRequired,
+  onChange: PropTypes.func,
   options: PropTypes.arrayOf(PropTypes.object),
   optionUrl: PropTypes.string,
   passRef: PropTypes.bool.isRequired,
   searchable: PropTypes.bool.isRequired,
-  value: PropTypes.any.isRequired,
+  value: PropTypes.any,
   SelectComponent: PropTypes.oneOfType([PropTypes.object, PropTypes.func]).isRequired,
   AsyncSelectComponent: PropTypes.oneOfType([PropTypes.object, PropTypes.func]).isRequired,
 };
@@ -184,6 +184,8 @@ SearchableDropdownField.defaultProps = {
   multi: false,
   passRef: true,
   placeholder: '',
+  onChange: () => {},
+  value: '',
   SelectComponent: Select,
   AsyncSelectComponent: AsyncSelect,
 };

diff --git a/client/src/legacy/SearchableDropdownField/SearchableDropdownFieldEntwine.js b/client/src/legacy/SearchableDropdownField/SearchableDropdownFieldEntwine.js
@@ -13,18 +13,22 @@ window.jQuery.entwine('ss', ($) => {
       const cmsContent = this.closest('.cms-content').attr('id');
       const context = cmsContent ? { context: cmsContent } : {};
       const schema = this.data('schema');
-      this.data('entwine-value', schema.value);
-      const Root = createRoot(this[0]);
-      const ReactField = loadComponent(schema.component, context);
-      this.setRoot(Root);
-      this.setComponent(ReactField);
-      this._super();
-      this.refresh();
+      if (schema) {
+        this.data('entwine-value', schema.value);
+        const Root = createRoot(this[0]);
+        const ReactField = loadComponent(schema.component, context);
+        this.setRoot(Root);
+        this.setComponent(ReactField);
+        this._super();
+        this.refresh();
+      }
     },
 
     onunmatch() {
       const Root = this.getRoot();
-      Root.unmount();
+      if (Root) {
+        Root.unmount();
+      }
     },
 
     getProps() {