@etsoo/materialui 1.0.11 → 1.0.12

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/lib/pages/ViewPage.d.ts +1 -1
  2. package/lib/pages/ViewPage.js +14 -10
  3. package/package.json +1 -1
  4. package/src/pages/ViewPage.tsx +17 -12
package/lib/pages/ViewPage.d.ts CHANGED
@@ -22,7 +22,7 @@ export interface ViewPageField<T extends object> extends GridProps {
22
22
  /**
23
23
  * Display as single row
24
24
  */
25
- singleRow?: boolean;
25
+ singleRow?: boolean | 'default' | 'small';
26
26
  /**
27
27
  * Render props
28
28
  */
package/lib/pages/ViewPage.js CHANGED
@@ -20,7 +20,6 @@ function getItemField(field, data) {
20
20
  var _a, _b, _c;
21
21
  // Item data and label
22
22
  let itemData, itemLabel, gridProps = {};
23
- let xs = 6;
24
23
  if (Array.isArray(field)) {
25
24
  const [fieldData, fieldType, renderProps] = field;
26
25
  itemData = GridDataFormat(data[fieldData], fieldType, renderProps);
@@ -28,13 +27,22 @@ function getItemField(field, data) {
28
27
  }
29
28
  else if (typeof field === 'object') {
30
29
  // Destruct
31
- const { data: fieldData, dataType, label: fieldLabel, renderProps, singleRow, ...rest } = field;
30
+ const { data: fieldData, dataType, label: fieldLabel, renderProps, singleRow = 'default', ...rest } = field;
31
+ const res = singleRow === 'default'
32
+ ? { xs: 12, sm: 12, md: 6, lg: 6, xl: 4 }
33
+ : singleRow === true
34
+ ? { xs: 12, sm: 12, md: 12, lg: 12, xl: 12 }
35
+ : {
36
+ xs: singleRow === false ? 12 : 6,
37
+ sm: 6,
38
+ md: 6,
39
+ lg: 4,
40
+ xl: 3
41
+ };
32
42
  gridProps = {
33
43
  ...rest,
34
- ...(singleRow && { xs: 12, sm: 12, md: 12, lg: 12, xl: 12 })
44
+ ...res
35
45
  };
36
- if (singleRow === false)
37
- xs = 12;
38
46
  // Field data
39
47
  if (typeof fieldData === 'function')
40
48
  itemData = fieldData(data);
@@ -52,11 +60,7 @@ function getItemField(field, data) {
52
60
  itemData = formatItemData(data[field]);
53
61
  itemLabel = (_c = globalApp.get(field)) !== null && _c !== void 0 ? _c : field;
54
62
  }
55
- return [
56
- itemData,
57
- itemLabel,
58
- { xs, sm: 6, md: 6, lg: 4, xl: 3, ...gridProps }
59
- ];
63
+ return [itemData, itemLabel, gridProps];
60
64
  }
61
65
  /**
62
66
  * View page
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/materialui",
3
- "version": "1.0.11",
3
+ "version": "1.0.12",
4
4
  "description": "TypeScript Material-UI Implementation",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
package/src/pages/ViewPage.tsx CHANGED
@@ -38,7 +38,7 @@ export interface ViewPageField<T extends object> extends GridProps {
38
38
  /**
39
39
  * Display as single row
40
40
  */
41
- singleRow?: boolean;
41
+ singleRow?: boolean | 'default' | 'small';
42
42
 
43
43
  /**
44
44
  * Render props
@@ -107,8 +107,6 @@ function getItemField<T extends object>(
107
107
  itemLabel: React.ReactNode,
108
108
  gridProps: GridProps = {};
109
109
 
110
- let xs = 6;
111
-
112
110
  if (Array.isArray(field)) {
113
111
  const [fieldData, fieldType, renderProps] = field;
114
112
  itemData = GridDataFormat(data[fieldData], fieldType, renderProps);
@@ -120,17 +118,28 @@ function getItemField<T extends object>(
120
118
  dataType,
121
119
  label: fieldLabel,
122
120
  renderProps,
123
- singleRow,
121
+ singleRow = 'default',
124
122
  ...rest
125
123
  } = field;
126
124
 
125
+ const res =
126
+ singleRow === 'default'
127
+ ? { xs: 12, sm: 12, md: 6, lg: 6, xl: 4 }
128
+ : singleRow === true
129
+ ? { xs: 12, sm: 12, md: 12, lg: 12, xl: 12 }
130
+ : {
131
+ xs: singleRow === false ? 12 : 6,
132
+ sm: 6,
133
+ md: 6,
134
+ lg: 4,
135
+ xl: 3
136
+ };
137
+
127
138
  gridProps = {
128
139
  ...rest,
129
- ...(singleRow && { xs: 12, sm: 12, md: 12, lg: 12, xl: 12 })
140
+ ...res
130
141
  };
131
142
 
132
- if (singleRow === false) xs = 12;
133
-
134
143
  // Field data
135
144
  if (typeof fieldData === 'function') itemData = fieldData(data);
136
145
  else if (dataType == null) itemData = formatItemData(data[fieldData]);
@@ -149,11 +158,7 @@ function getItemField<T extends object>(
149
158
  itemLabel = globalApp.get<string>(field) ?? field;
150
159
  }
151
160
 
152
- return [
153
- itemData,
154
- itemLabel,
155
- { xs, sm: 6, md: 6, lg: 4, xl: 3, ...gridProps }
156
- ];
161
+ return [itemData, itemLabel, gridProps];
157
162
  }
158
163
 
159
164
  /**