Skip to content

Commit 010837b

Browse files
novykhnovykh
committed
Minor fixes.
1 parent 6ef34b0 commit 010837b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+596
-1062
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"dependencies": {
3434
"@elastic/react-search-ui": "^1.15.0",
3535
"@elastic/search-ui-site-search-connector": "^1.15.0",
36-
"@netdata/react-filter-box": "^1.0.0",
3736
"@prismicio/client": "5.1.1",
3837
"@styled-system/css": "^5.1.5",
3938
"@tanstack/react-table": "^8.5.11",
@@ -42,6 +41,7 @@
4241
"polished": "^4.2.2",
4342
"ramda": "^0.28.0",
4443
"react-beautiful-dnd": "^13.1.0",
44+
"react-filter-box": "^3.4.3",
4545
"react-portal": "^4.2.2",
4646
"react-select": "^5.4.0",
4747
"react-table": "^7.8.0",

‎src/components/button/button.stories.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Button, IconButton } from "."
99
import readme from "./README.md"
1010
import { iconsList } from "src/components/icon"
1111

12-
const buttonStory = storiesOf("Input/Button", module)
12+
const buttonStory = storiesOf("Inputs/Button", module)
1313
const icons = Object.keys(iconsList)
1414

1515
const subData = {

‎src/components/checkbox/checkbox.stories.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { getGutterHeight } from "src/theme/utils"
77
import { readmeCleanup } from "utils/readme"
88
import readme from "./README.md"
99

10-
const checkBoxStory = storiesOf("Input/Checkbox", module)
10+
const checkBoxStory = storiesOf("Inputs/Checkbox", module)
1111

1212
const position = ["left", "right"]
1313

‎src/components/collapsible/index.stories.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Button } from "src/components/button"
99
import readme from "./README.md"
1010
import Collapsible from "./index"
1111

12-
const story = storiesOf("COMPONENTS|Collapsible", module)
12+
const story = storiesOf("Utils/Collapsible", module)
1313

1414
const subData = {
1515
readme: {

‎src/components/confirmation-dialog/confirmation-dialog.stories.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { boolean } from "@storybook/addon-knobs"
44

55
import ConfirmationDialog from "./confirmation-dialog"
66

7-
const Story = storiesOf("COMPONENTS|ConfirmationDialog")
7+
const Story = storiesOf("Utils/ConfirmationDialog", module)
88

99
Story.add("Confirmation dialog", () => {
1010
return (

‎src/components/drops/tooltip/index.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ReactNode } from "react"
1+
import { ReactNode, FC } from "react"
22
import { DropProps } from "../drop"
33

44
export interface PopoverProps {
@@ -12,7 +12,7 @@ export interface PopoverProps {
1212
[key: string]: any
1313
}
1414

15-
declare const Popover: React.FC<PopoverProps & JSX.IntrinsicElements["div"]>
15+
declare const Popover: FC<PopoverProps & JSX.IntrinsicElements["div"]>
1616

1717
export { Popover }
1818

‎src/components/drops/tooltip/index.js

+3-22
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { forwardRef, Fragment, useLayoutEffect, useState, useRef } from "react"
1+
import React, { forwardRef, Fragment, useLayoutEffect } from "react"
22
import Drop from "src/components/drops/drop"
33
import useForwardRef from "src/hooks/use-forward-ref"
44
import useToggle from "src/hooks/use-toggle"
@@ -21,28 +21,19 @@ const Tooltip = forwardRef(
2121
disabled,
2222
zIndex = 80,
2323
children,
24-
onClickOutside,
2524
allowHoverOnTooltip,
2625
...rest
2726
},
2827
parentRef
2928
) => {
3029
const id = useDescribedId(rest["aria-describedby"])
3130
const [isOpen, , open, close] = useToggle(false)
32-
const [hasPopUpHovered, setHasPopUpHovered] = useState(false)
33-
const closeWithDelayTimeout = useRef()
3431

3532
const [ref, setRef] = useForwardRef(parentRef)
3633

37-
const handleCloseWithDelay = () => {
38-
closeWithDelayTimeout.current = setTimeout(() => {
39-
close()
40-
}, 200)
41-
}
42-
4334
const targetElement = useClonedChildren(children, setRef, {
4435
onMouseEnter: open,
45-
onMouseLeave: allowHoverOnTooltip ? handleCloseWithDelay : close,
36+
onMouseLeave: !allowHoverOnTooltip ? close : undefined,
4637
onFocus: open,
4738
onBlur: close,
4839
...(isOpen && { "aria-describedby": id }),
@@ -53,12 +44,6 @@ const Tooltip = forwardRef(
5344
if (ref.current && initialOpen) open()
5445
}, [])
5546

56-
useLayoutEffect(() => {
57-
if (hasPopUpHovered && closeWithDelayTimeout.current) {
58-
clearTimeout(closeWithDelayTimeout.current)
59-
}
60-
}, [hasPopUpHovered])
61-
6247
if (!content) {
6348
return children
6449
}
@@ -72,11 +57,7 @@ const Tooltip = forwardRef(
7257
hideShadow
7358
id={id}
7459
onClickOutside={close}
75-
onMouseLeave={() => {
76-
setHasPopUpHovered(false)
77-
close()
78-
}}
79-
onMouseEnter={() => setHasPopUpHovered(true)}
60+
onMouseLeave={close}
8061
target={ref.current}
8162
{...dropProps}
8263
animation={animation}

‎src/components/filter-box/filter-box.stories.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { FilterBox, FilterBoxProcessing } from "."
66
import { Text } from "src/components/typography"
77
import readme from "./README.md"
88

9-
const filterBoxStory = storiesOf("Input/Filter Box", module)
9+
const filterBoxStory = storiesOf("Inputs/Filter Box", module)
1010

1111
const subData = {
1212
readme: {

‎src/components/icon/assets/checkmark.svg

+3-3
Loading

‎src/components/icon/assets/edit.svg

+4
Loading

‎src/components/icon/icons-list.js

+2
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ import documentation from "./assets/documentation.svg"
8181
import dot from "./assets/dot.svg"
8282
import dots_2x3 from "./assets/dots_2x3.svg"
8383
import download from "./assets/download.svg"
84+
import edit from "./assets/edit.svg"
8485
import error from "./assets/error.svg"
8586
import exclamation from "./assets/exclamation.svg"
8687
import expand from "./assets/expand.svg"
@@ -392,6 +393,7 @@ export const iconsList = {
392393
dot,
393394
dots_2x3,
394395
download,
396+
edit,
395397
error,
396398
exclamation,
397399
expand,

‎src/components/input/input.stories.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Button } from "src/components/button"
1010
import { Icon } from "src/components/icon"
1111
import readme from "./README.md"
1212

13-
const inputStory = storiesOf("Components|Controls/TextInput", module)
13+
const inputStory = storiesOf("Inputs/TextInput", module)
1414

1515
const subData = {
1616
readme: {

‎src/components/input/range/range.stories.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useState } from "react"
22
import { storiesOf } from "@storybook/react"
33
import RangeInput from "./index"
44

5-
const rangeStory = storiesOf("Components|Controls/InputRange", module)
5+
const rangeStory = storiesOf("Inputs/InputRange", module)
66

77
rangeStory.add("Input Range", () => {
88
const [value, setValue] = useState(0.1)

‎src/components/modal/index.stories.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Modal, { ModalContent, ModalHeader, ModalBody, ModalFooter, ModalCloseBut
55
import Flex from "../templates/flex"
66
import { Button } from "../button"
77

8-
const modalStory = storiesOf("Utils/Modal")
8+
const modalStory = storiesOf("Utils/Modal", module)
99

1010
modalStory.add("Modal", () => {
1111
return (

‎src/components/pill/index.stories.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Flex from "src/components/templates/flex"
55
import Pill from "./index"
66
import MasterCard from "./mastercard"
77

8-
const story = storiesOf("Atoms/Pills")
8+
const story = storiesOf("Atoms/Pills", module)
99

1010
const Custom = () => (
1111
<Flex gap={4}>

‎src/components/radio-button/index.stories.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import readme from "./README.md"
66

77
import RadioButton from "./index"
88

9-
const radioButtonStory = storiesOf("Input/RadioButton", module)
9+
const radioButtonStory = storiesOf("Inputs/RadioButton", module)
1010

1111
const subData = {
1212
readme: {

‎src/components/tableV2/components/actionWithDropdown.js renamed to ‎src/components/tableV2/components/columnVisibilityAction.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React, { useRef } from "react"
33
import BulkAction from "./bulkAction"
44
import ColumnsMenu from "./columnsMenu" //todo refactor this as right now is used only for the dropdown for column visibility
55

6-
const ActionWithDropdown = ({
6+
const ColumnVisibilityAction = ({
77
alwaysEnabled,
88
columnPinning = {},
99
enableColumnPinning,
@@ -73,4 +73,4 @@ const ActionWithDropdown = ({
7373
)
7474
}
7575

76-
export default ActionWithDropdown
76+
export default ColumnVisibilityAction

‎src/components/tableV2/components/columnsMenu.js

+13-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,19 @@ import React from "react"
22
import Drop from "src/components/drops/drop/index.js"
33
import Flex from "src/components/templates/flex"
44
import { Text } from "src/components/typography"
5-
import ColumnsMenuItem from "src/components/tableV2/components/columnsMenuItem"
5+
import { Checkbox } from "src/components/checkbox"
6+
import { ListItem } from "src/components/typography"
7+
8+
const ColumnsMenuItem = ({ column, disabled }) => (
9+
<Flex alignItems="center" as={ListItem} justifyContent="between" padding={[1]}>
10+
<Checkbox
11+
checked={column.getIsVisible()}
12+
disabled={disabled}
13+
label={column.id}
14+
onChange={column.getToggleVisibilityHandler()}
15+
/>
16+
</Flex>
17+
)
618

719
const ColumnsMenu = ({ parentRef, isOpen, columns, onClose, pinnedColumns }) => {
820
if (parentRef.current && isOpen)

‎src/components/tableV2/components/columnsMenuItem.js

-17
This file was deleted.

‎src/components/tableV2/context/sharedTable.js

-33
This file was deleted.

0 commit comments

Comments
 (0)