Skip to content

Commit 6967472

Browse files
committed
Add core and integrate it into filters
1 parent c6cc6bd commit 6967472

File tree

7 files changed

+27
-157
lines changed

7 files changed

+27
-157
lines changed

packages/filter/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@equinor/workspace-filter",
3-
"version": "4.0.5",
3+
"version": "4.0.6",
44
"type": "module",
55
"sideEffects": false,
66
"license": "MIT",
@@ -30,6 +30,7 @@
3030
"@equinor/eds-icons": "^0.18.0",
3131
"@equinor/eds-tokens": "^0.9.0",
3232
"@tanstack/react-query": "^5.32.0",
33+
"@equinor/workspace-core": "workspace:^",
3334
"react-error-boundary": "^4.0.13",
3435
"react-sortablejs": "^6.1.4",
3536
"react-virtual": "^2.10.4",

packages/filter/src/lib/components/expandedFilterGroup/ExpandedFilterGroup.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Button, Icon, Search } from '@equinor/eds-core-react';
2-
import { useMemo, useState } from 'react';
2+
import { useMemo, useRef, useState } from 'react';
33
import { FilterClearIcon } from '../../icons';
44
import { FilterGroup, FilterValueType } from '../../types';
5-
5+
import { useClickOutside } from '@equinor/workspace-core';
66
import { Case, Switch } from '../../utils/Switch';
77
import { StyledSearchButton, StyledFilterHeaderGroup, StyledTitle, StyledWrapper } from './expandedFilterGroup.styles';
88
import { VirtualContainer } from '../virtualContainer/VirtualContainer';
@@ -21,6 +21,12 @@ export const ExpandedFilterGroup = ({ filterGroup, isFetching }: FilterGroupeCom
2121
const [filterSearchValue, setFilterSearchValue] = useState('');
2222
const [searchActive, setSearchActive] = useState(false);
2323

24+
const ref = useRef<HTMLDivElement>(null);
25+
useClickOutside(ref, () => {
26+
setSearchActive(false);
27+
setFilterSearchValue('');
28+
});
29+
2430
function handleOnChange(event: React.ChangeEvent<HTMLInputElement>) {
2531
const { value } = event.target;
2632
setFilterSearchValue(value);
@@ -50,16 +56,12 @@ export const ExpandedFilterGroup = ({ filterGroup, isFetching }: FilterGroupeCom
5056
}
5157

5258
return (
53-
<StyledWrapper>
59+
<StyledWrapper ref={ref}>
5460
<StyledFilterHeaderGroup isActive={hasAnyActiveFilters}>
5561
<Switch>
5662
<Case when={searchActive}>
5763
<Search
5864
autoFocus={searchActive}
59-
onBlur={() => {
60-
setSearchActive(false);
61-
setFilterSearchValue('');
62-
}}
6365
aria-label="in filter group"
6466
id="search-normal"
6567
placeholder="Search"

packages/power-bi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@equinor/workspace-powerbi",
3-
"version": "3.0.8",
3+
"version": "3.0.9",
44
"type": "module",
55
"sideEffects": false,
66
"license": "MIT",

packages/power-bi/src/lib/components/Header/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Button, Icon, Search } from '@equinor/eds-core-react';
22
import { useState } from 'react';
33
import styled from 'styled-components';
4-
import useClickOutside from '@equinor/workspace-core';
4+
import { useClickOutside } from '@equinor/workspace-core';
55
import { FilterClearIcon } from '../../icons';
66
import { FilterController } from '../Filter/Filter';
77
import { Case, Switch } from '../switch/Switch';

packages/power-bi/src/lib/hooks/useClickOutside.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

packages/workspace-fusion/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@equinor/workspace-fusion",
3-
"version": "9.0.18",
3+
"version": "9.0.19",
44
"type": "module",
55
"sideEffects": false,
66
"license": "MIT",

pnpm-lock.yaml

Lines changed: 13 additions & 116 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)