@gisce/react-ooui 2.0.0-alpha.56 → 2.0.0-alpha.58

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 +1 @@
1
- {"version":3,"file":"DateTimeRangePicker.d.ts","sourceRoot":"","sources":["../../../../src/widgets/views/searchFilter/DateTimeRangePicker.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAGtC,eAAO,MAAM,mBAAmB,UAAW,WAAW,4CAoDrD,CAAC"}
1
+ {"version":3,"file":"DateTimeRangePicker.d.ts","sourceRoot":"","sources":["../../../../src/widgets/views/searchFilter/DateTimeRangePicker.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAGtC,eAAO,MAAM,mBAAmB,UAAW,WAAW,4CAgDrD,CAAC"}
@@ -1,10 +1,10 @@
1
- import React from "react";
1
+ import { ReactElement } from "react";
2
2
  type Props = {
3
3
  advancedFilter: boolean;
4
4
  isSearching: boolean;
5
5
  onAdvancedFilterToggle: () => void;
6
6
  onClear: () => void;
7
7
  };
8
- export declare function SearchBottomBar(props: Props): React.ReactElement;
8
+ export declare function SearchBottomBar(props: Props): ReactElement;
9
9
  export {};
10
10
  //# sourceMappingURL=SearchBottomBar.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"SearchBottomBar.d.ts","sourceRoot":"","sources":["../../../../src/widgets/views/searchFilter/SearchBottomBar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAY1C,KAAK,KAAK,GAAG;IACX,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,sBAAsB,EAAE,MAAM,IAAI,CAAC;IACnC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,YAAY,CAkChE"}
1
+ {"version":3,"file":"SearchBottomBar.d.ts","sourceRoot":"","sources":["../../../../src/widgets/views/searchFilter/SearchBottomBar.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,OAAO,CAAC;AAYjD,KAAK,KAAK,GAAG;IACX,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,sBAAsB,EAAE,MAAM,IAAI,CAAC;IACnC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,YAAY,CAkC1D"}
@@ -1 +1 @@
1
- {"version":3,"file":"SearchFilter.d.ts","sourceRoot":"","sources":["../../../../src/widgets/views/searchFilter/SearchFilter.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAOvC,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,iBAAS,YAAY,CAAC,KAAK,EAAE,KAAK,2CAyHjC;AAED,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"SearchFilter.d.ts","sourceRoot":"","sources":["../../../../src/widgets/views/searchFilter/SearchFilter.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAOvC,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,iBAAS,YAAY,CAAC,KAAK,EAAE,KAAK,2CA0HjC;AAED,eAAe,YAAY,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gisce/react-ooui",
3
- "version": "2.0.0-alpha.56",
3
+ "version": "2.0.0-alpha.58",
4
4
  "engines": {
5
5
  "node": "20.5.0"
6
6
  },
@@ -36,7 +36,7 @@
36
36
  "@gisce/fiber-diagram": "^1.1.0-rc.3",
37
37
  "@gisce/ooui": "1.0.0-alpha.21",
38
38
  "@gisce/react-formiga-components": "^1.0.9-rc.21",
39
- "@gisce/react-formiga-table": "1.0.0-alpha.11",
39
+ "@gisce/react-formiga-table": "1.0.0-alpha.12",
40
40
  "@monaco-editor/react": "^4.4.5",
41
41
  "@tabler/icons-react": "^2.11.0",
42
42
  "antd": "^5.5.2",
@@ -1,6 +1,4 @@
1
1
  import { DatePicker, TimePicker, Row, Col } from "antd";
2
-
3
- import React from "react";
4
2
  import Field from "@/common/Field";
5
3
  import { Field as FieldOoui, Label as LabelOoui } from "@gisce/ooui";
6
4
  import { WidgetProps } from "@/types";
@@ -48,14 +46,41 @@ export const DateTimeRangePicker = (props: WidgetProps) => {
48
46
  </Col>
49
47
  <Col>
50
48
  <Field {...props} ooui={fields[1]} showLabel={false}>
51
- <TimePicker.RangePicker
52
- className="w-60"
53
- allowEmpty={[true, true]}
54
- format={"HH:mm"}
55
- ></TimePicker.RangePicker>
49
+ <TimeRangePicker />
56
50
  </Field>
57
51
  </Col>
58
52
  </Row>
59
53
  </>
60
54
  );
61
55
  };
56
+
57
+ const TimeRangePicker = ({
58
+ value,
59
+ onChange,
60
+ }: {
61
+ value?: any;
62
+ onChange?: (newValue: any) => void;
63
+ }) => {
64
+ return (
65
+ <div style={{ marginTop: 5 }}>
66
+ <TimePicker
67
+ placeholder="Start time"
68
+ style={{ width: 115, marginRight: 10 }}
69
+ format={"HH:mm"}
70
+ value={value?.[0]}
71
+ onChange={(newValue) => {
72
+ onChange?.([newValue, value?.[1]]);
73
+ }}
74
+ />
75
+ <TimePicker
76
+ placeholder="End time"
77
+ style={{ width: 115 }}
78
+ format={"HH:mm"}
79
+ value={value?.[1]}
80
+ onChange={(newValue) => {
81
+ onChange?.([value?.[0], newValue]);
82
+ }}
83
+ />
84
+ </div>
85
+ );
86
+ };
@@ -1,4 +1,4 @@
1
- import React, { useContext } from "react";
1
+ import { ReactElement, useContext } from "react";
2
2
 
3
3
  import { Row, Col, Button } from "antd";
4
4
  import {
@@ -17,7 +17,7 @@ type Props = {
17
17
  onClear: () => void;
18
18
  };
19
19
 
20
- export function SearchBottomBar(props: Props): React.ReactElement {
20
+ export function SearchBottomBar(props: Props): ReactElement {
21
21
  const { onAdvancedFilterToggle, advancedFilter, onClear, isSearching } =
22
22
  props;
23
23
 
@@ -1,4 +1,4 @@
1
- import React, { useEffect, useRef, useState } from "react";
1
+ import { useEffect, useRef, useState } from "react";
2
2
  import { Form, Row, Col, Alert, theme } from "antd";
3
3
  import useDeepCompareEffect from "use-deep-compare-effect";
4
4
 
@@ -60,6 +60,7 @@ function SearchFilter(props: Props) {
60
60
 
61
61
  useEffect(() => {
62
62
  form.setFieldsValue(searchValues);
63
+ // eslint-disable-next-line react-hooks/exhaustive-deps
63
64
  }, [searchValues]);
64
65
 
65
66
  const getRowsAndCols = () => {