@onehat/ui 0.3.318 → 0.3.320
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.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onehat/ui",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.320",
|
|
4
4
|
"description": "Base UI for OneHat apps",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -25,6 +25,7 @@
|
|
|
25
25
|
},
|
|
26
26
|
"license": "UNLICENSED",
|
|
27
27
|
"dependencies": {
|
|
28
|
+
"@gluestack-style/animation-resolver": "^1.0.4",
|
|
28
29
|
"@gluestack-style/react": "^1.0.56",
|
|
29
30
|
"@gluestack-ui/config": "^1.1.18",
|
|
30
31
|
"@gluestack-ui/themed": "^1.1.26",
|
|
@@ -46,6 +46,7 @@ export function ComboComponent(props) {
|
|
|
46
46
|
showEyeButton = false,
|
|
47
47
|
viewerProps = {}, // popup for eyeButton
|
|
48
48
|
_input = {},
|
|
49
|
+
_editor = {},
|
|
49
50
|
isEditor = false,
|
|
50
51
|
isDisabled = false,
|
|
51
52
|
isInTag = false,
|
|
@@ -817,6 +818,7 @@ export function ComboComponent(props) {
|
|
|
817
818
|
onInputFocus();
|
|
818
819
|
}
|
|
819
820
|
}}
|
|
821
|
+
{..._editor}
|
|
820
822
|
/>;
|
|
821
823
|
if (UiGlobals.mode === UI_MODE_WEB) {
|
|
822
824
|
dropdownMenu = <Popover
|
|
@@ -7,12 +7,12 @@ import {
|
|
|
7
7
|
import {
|
|
8
8
|
UI_MODE_REACT_NATIVE,
|
|
9
9
|
UI_MODE_WEB,
|
|
10
|
-
} from '../../../
|
|
10
|
+
} from '../../../Constants/UiModes.js';
|
|
11
11
|
import UiGlobals from '../../../UiGlobals.js';
|
|
12
12
|
import withComponent from '../../Hoc/withComponent.js';
|
|
13
13
|
import withValue from '../../Hoc/withValue.js';
|
|
14
|
-
import testProps from '../../../
|
|
15
|
-
import getComponentFromType from '../../../
|
|
14
|
+
import testProps from '../../../Functions/testProps.js';
|
|
15
|
+
import getComponentFromType from '../../../Functions/getComponentFromType.js';
|
|
16
16
|
import _ from 'lodash';
|
|
17
17
|
|
|
18
18
|
|
|
@@ -273,7 +273,7 @@ export default function withFilters(WrappedComponent) {
|
|
|
273
273
|
type: filterType,
|
|
274
274
|
title,
|
|
275
275
|
} = filter;
|
|
276
|
-
|
|
276
|
+
|
|
277
277
|
if (!title) {
|
|
278
278
|
const propertyDef = Repository.getSchema().getPropertyDefinition(field);
|
|
279
279
|
title = propertyDef?.title;
|
|
@@ -282,7 +282,8 @@ export default function withFilters(WrappedComponent) {
|
|
|
282
282
|
if (_.isString(filterType)) {
|
|
283
283
|
if (filterType === FILTER_TYPE_ANCILLARY) {
|
|
284
284
|
title = modelFilterTypes[field].title;
|
|
285
|
-
|
|
285
|
+
const tagOrCombo = Repository.schema.model.ancillaryFiltersThatUseTags && inArray(field, Repository.schema.model.ancillaryFiltersThatUseTags) ? 'Tag' : 'Combo';
|
|
286
|
+
filterType = Inflector.camelize(Inflector.pluralize(field)) + tagOrCombo; // Convert field to PluralCamelCombo
|
|
286
287
|
}
|
|
287
288
|
Element = getComponentFromType(filterType);
|
|
288
289
|
if (filterType === 'Input') {
|