@onehat/ui 0.3.53 → 0.3.55

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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/Components/Hoc/withPresetButtons.js +10 -18
  3. package/src/Components/Panel/Header.js +5 -4
  4. package/src/Components/Panel/Panel.js +1 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onehat/ui",
3
- "version": "0.3.53",
3
+ "version": "0.3.55",
4
4
  "description": "Base UI for OneHat apps",
5
5
  "main": "src/index.js",
6
6
  "type": "module",
package/src/Components/Hoc/withPresetButtons.js CHANGED
@@ -32,8 +32,8 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
32
32
 
33
33
  const {
34
34
  // extract and pass
35
- contextMenuItems,
36
- additionalToolbarButtons,
35
+ contextMenuItems = [],
36
+ additionalToolbarButtons = [],
37
37
  onChangeColumnsConfig,
38
38
  verifyCanEdit,
39
39
  verifyCanDelete,
@@ -291,26 +291,18 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
291
291
  if (!isReady) {
292
292
  return null;
293
293
  }
294
-
295
- const
296
- contextMenuItemsToPass = [
297
- ...localContextMenuItems,
298
- ],
299
- additionalToolbarButtonsToPass = [
300
- ...localAdditionalToolbarButtons,
301
- ];
302
- if (contextMenuItems) {
303
- contextMenuItemsToPass.concat(contextMenuItems);
304
- }
305
- if (additionalToolbarButtons) {
306
- additionalToolbarButtonsToPass.concat(additionalToolbarButtons);
307
- }
308
294
 
309
295
  return <WrappedComponent
310
296
  {...propsToPass}
311
297
  disablePresetButtons={false}
312
- contextMenuItems={contextMenuItemsToPass}
313
- additionalToolbarButtons={additionalToolbarButtonsToPass}
298
+ contextMenuItems={[
299
+ ...contextMenuItems,
300
+ ...localContextMenuItems,
301
+ ]}
302
+ additionalToolbarButtons={[
303
+ ...additionalToolbarButtons,
304
+ ...localAdditionalToolbarButtons,
305
+ ]}
314
306
  onChangeColumnsConfig={onChangeColumnsConfigDecorator}
315
307
  />;
316
308
  };
package/src/Components/Panel/Header.js CHANGED
@@ -27,8 +27,7 @@ export default function Header(props) {
27
27
  const {
28
28
  testID = 'Header',
29
29
  title = '',
30
- isClosable = true,
31
- onClose = emptyFn,
30
+ onClose,
32
31
  isCollapsible = true,
33
32
  collapseDirection = VERTICAL,
34
33
  isCollapsed = false,
@@ -38,13 +37,15 @@ export default function Header(props) {
38
37
 
39
38
  let closeBtn = null,
40
39
  collapseBtn = null;
41
- if (isClosable) {
40
+ if (onClose) {
42
41
  closeBtn = <IconButton
43
42
  icon={<Icon as={Xmark} size={styles.PANEL_HEADER_ICON_SIZE} color={styles.PANEL_HEADER_ICON_COLOR} />}
44
43
  onPress={onClose}
45
44
  testID="closeBtn"
46
45
  alignSelf="center"
47
- mr={1}
46
+ mr={3}
47
+ borderWidth={1}
48
+ borderColor="trueGray.400"
48
49
  />;
49
50
  }
50
51
  if (isCollapsible) {
package/src/Components/Panel/Panel.js CHANGED
@@ -38,8 +38,7 @@ function Panel(props) {
38
38
  title = props.model ? UiGlobals.customInflect(Inflector.camel2words(Inflector.underscore(props.model))) : '',
39
39
  showHeader = true,
40
40
  header = null,
41
- isClosable = false,
42
- onClose = emptyFn,
41
+ onClose,
43
42
  isCollapsible = true,
44
43
  isCollapsed = false,
45
44
  setIsCollapsed,
@@ -87,7 +86,6 @@ function Panel(props) {
87
86
  if (showHeader && title) {
88
87
  headerComponent = <Header
89
88
  title={title + titleSuffix}
90
- isClosable={isClosable}
91
89
  onClose={onClose}
92
90
  isCollapsible={isCollapsible}
93
91
  isCollapsed={isCollapsed}