@equinor/fusion-react-filter 1.5.0 → 1.5.1
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.
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ChipElementProps } from '@equinor/fusion-wc-chip';
|
|
2
2
|
export type SelectionChipsProps = JSX.IntrinsicElements['div'] & {
|
|
3
|
-
readonly chips:
|
|
3
|
+
readonly chips: Pick<ChipElementProps, 'variant'>;
|
|
4
4
|
};
|
|
5
5
|
export declare const SelectionChips: (props: SelectionChipsProps) => JSX.Element;
|
|
6
6
|
//# sourceMappingURL=SelectionChips.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectionChips.d.ts","sourceRoot":"","sources":["../../../src/components/misc/SelectionChips.tsx"],"names":[],"mappings":"AAIA,
|
|
1
|
+
{"version":3,"file":"SelectionChips.d.ts","sourceRoot":"","sources":["../../../src/components/misc/SelectionChips.tsx"],"names":[],"mappings":"AAIA,OAAa,EAAe,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AA4C9E,MAAM,MAAM,mBAAmB,GAAG,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG;IAC/D,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;CACnD,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,mBAAmB,KAAG,WAwD3D,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import {
|
|
3
|
-
import { useCallback, useMemo, useState } from 'react';
|
|
2
|
+
import { useEffect, useMemo, useRef, useState } from 'react';
|
|
4
3
|
import { combineLatest, of } from 'rxjs';
|
|
5
4
|
import { switchMap } from 'rxjs/operators';
|
|
6
5
|
import { useSubscription } from '@equinor/fusion-react-observable';
|
|
7
|
-
import
|
|
6
|
+
import Chip from '@equinor/fusion-wc-chip';
|
|
8
7
|
import { useFilterContext } from '../../hooks';
|
|
9
8
|
import { actions } from '../../actions';
|
|
10
9
|
import { clsx, createStyles, makeStyles } from '@equinor/fusion-react-styles';
|
|
10
|
+
Chip;
|
|
11
11
|
/** method for extracting selection to array */
|
|
12
12
|
const formatSelection = (selection) => {
|
|
13
13
|
switch (true) {
|
|
@@ -37,6 +37,7 @@ export const SelectionChips = (props) => {
|
|
|
37
37
|
const { chips, className, ...args } = props;
|
|
38
38
|
const { filter$, selection$ } = useFilterContext();
|
|
39
39
|
const [items, setItems] = useState([]);
|
|
40
|
+
const ref = useRef(null);
|
|
40
41
|
useSubscription(useMemo(() =>
|
|
41
42
|
/** Observe filter and selection changes */
|
|
42
43
|
combineLatest([filter$, selection$]).pipe(switchMap(([filters, selections]) => {
|
|
@@ -51,12 +52,18 @@ export const SelectionChips = (props) => {
|
|
|
51
52
|
.filter((x) => !!x.title && !!x.selection.length);
|
|
52
53
|
return of(items);
|
|
53
54
|
})), [filter$, selection$]), setItems);
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
useEffect(() => {
|
|
56
|
+
const el = ref.current;
|
|
57
|
+
if (el) {
|
|
58
|
+
const handler = (e) => {
|
|
59
|
+
const value = e.target.value;
|
|
60
|
+
selection$.next(actions.selection.remove(String(value)));
|
|
61
|
+
};
|
|
62
|
+
el.addEventListener('remove', handler);
|
|
63
|
+
return () => el.removeEventListener('remove', handler);
|
|
64
|
+
}
|
|
65
|
+
}, [ref, selection$]);
|
|
57
66
|
const styles = useStyles();
|
|
58
|
-
return (_jsx("div", { ...args, className: clsx(styles.root, className), children: items?.map((x) => (
|
|
59
|
-
_jsxs("span", { children: [x.title, " "] }),
|
|
60
|
-
_jsx("span", { slot: "graphic", className: styles.chip, children: x.selection.length })))) }));
|
|
67
|
+
return (_jsx("div", { ...args, className: clsx(styles.root, className), ref: ref, children: items?.map((x) => (_jsxs("fwc-chip", { value: x.key, removable: true, variant: chips.variant, children: [_jsxs("span", { children: [x.title, " "] }), _jsx("span", { slot: "graphic", className: styles.chip, children: x.selection.length })] }, x.key))) }));
|
|
61
68
|
};
|
|
62
69
|
//# sourceMappingURL=SelectionChips.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectionChips.js","sourceRoot":"","sources":["../../../src/components/misc/SelectionChips.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SelectionChips.js","sourceRoot":"","sources":["../../../src/components/misc/SelectionChips.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@equinor/fusion-react-filter",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.1",
|
|
4
4
|
"description": "component for Filtering data",
|
|
5
5
|
"author": "",
|
|
6
6
|
"homepage": "https://github.com/equinor/fusion-react-components/tree/master/packages/filter#readme",
|
|
@@ -36,13 +36,14 @@
|
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@equinor/fusion-react-button": "^0.9.0",
|
|
38
38
|
"@equinor/fusion-react-checkbox": "^0.6.0",
|
|
39
|
-
"@equinor/fusion-react-chip": "^0.
|
|
39
|
+
"@equinor/fusion-react-chip": "^0.5.0",
|
|
40
40
|
"@equinor/fusion-react-icon": "^0.3.0",
|
|
41
41
|
"@equinor/fusion-react-observable": "^1.2.0",
|
|
42
42
|
"@equinor/fusion-react-radio": "^0.5.0",
|
|
43
43
|
"@equinor/fusion-react-styles": "^0.6.0",
|
|
44
44
|
"@equinor/fusion-react-textinput": "^0.7.0",
|
|
45
45
|
"@equinor/fusion-react-utils": "^2.1.0",
|
|
46
|
+
"@equinor/fusion-wc-chip": "^1.1.0",
|
|
46
47
|
"rxjs": "^7.4.0",
|
|
47
48
|
"typesafe-actions": "^5.1.0"
|
|
48
49
|
},
|