@onehat/ui 0.3.249 → 0.3.251

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/Components/Form/Form.js +3 -3
  3. package/src/Components/Viewer/Viewer.js +3 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onehat/ui",
3
- "version": "0.3.249",
3
+ "version": "0.3.251",
4
4
  "description": "Base UI for OneHat apps",
5
5
  "main": "src/index.js",
6
6
  "type": "module",
package/src/Components/Form/Form.js CHANGED
@@ -473,11 +473,11 @@ function Form(props) {
473
473
  if (type === 'Row') {
474
474
  propsToPass.w = '100%';
475
475
  }
476
- const itemDefaults = item.defaults;
476
+ const itemDefaults = item.defaults || {};
477
477
  children = _.map(items, (item, ix) => {
478
- return buildFromItem(item, ix, itemDefaults);
478
+ return buildFromItem(item, ix, {...defaults, ...itemDefaults});
479
479
  });
480
- return <Element key={ix} title={title} {...itemDefaults} {...propsToPass} {...editorTypeProps}>{children}</Element>;
480
+ return <Element key={ix} title={title} {...defaults} {...itemDefaults} {...propsToPass} {...editorTypeProps}>{children}</Element>;
481
481
  }
482
482
 
483
483
  if (!label && Repository && propertyDef?.title) {
package/src/Components/Viewer/Viewer.js CHANGED
@@ -124,11 +124,11 @@ function Viewer(props) {
124
124
  } else if (type === 'FieldSet' && item.showToggleAllCheckbox) {
125
125
  propsToPass.showToggleAllCheckbox = false; // don't allow it in view mode
126
126
  }
127
- const defaults = item.defaults;
127
+ const itemDefaults = item.defaults || {};
128
128
  children = _.map(items, (item, ix) => {
129
- return buildFromItem(item, ix, defaults);
129
+ return buildFromItem(item, ix, {...defaults, ...itemDefaults});
130
130
  });
131
- return <Element key={ix} title={title} {...defaults} {...propsToPass} {...editorTypeProps}>{children}</Element>;
131
+ return <Element key={ix} title={title} {...defaults} {...itemDefaults} {...propsToPass} {...editorTypeProps}>{children}</Element>;
132
132
  }
133
133
 
134
134
  if (!label && Repository && propertyDef?.title) {