react-science 6.0.1 → 7.0.0

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.
Files changed (93) hide show
  1. package/lib/app/explorer/MeasurementExplorer.d.ts +2 -3
  2. package/lib/app/explorer/MeasurementExplorer.d.ts.map +1 -1
  3. package/lib/app/explorer/MeasurementExplorer.js +2 -2
  4. package/lib/app/explorer/MeasurementExplorer.js.map +1 -1
  5. package/lib/app/panels/measurements/MeasurementsPanel.d.ts.map +1 -1
  6. package/lib/app/panels/measurements/MeasurementsPanel.js +1 -0
  7. package/lib/app/panels/measurements/MeasurementsPanel.js.map +1 -1
  8. package/lib/app/panels/measurements/MeasurementsTable.js +2 -2
  9. package/lib/app/panels/measurements/MeasurementsTable.js.map +1 -1
  10. package/lib/app-data/kinds/iv/IvMeasurement.d.ts +1 -2
  11. package/lib/app-data/kinds/iv/IvMeasurement.d.ts.map +1 -1
  12. package/lib/app-data/state/data/data.helpers.d.ts +1 -1
  13. package/lib/components/button/Button.d.ts.map +1 -1
  14. package/lib/components/button/Button.js +19 -13
  15. package/lib/components/button/Button.js.map +1 -1
  16. package/lib/components/color-picker/gradient-select/GradientSelect.js +2 -2
  17. package/lib/components/color-picker/gradient-select/GradientSelect.js.map +1 -1
  18. package/lib/components/header/PanelHeader.d.ts.map +1 -1
  19. package/lib/components/header/PanelHeader.js +2 -19
  20. package/lib/components/header/PanelHeader.js.map +1 -1
  21. package/lib/components/index.d.ts +1 -0
  22. package/lib/components/index.d.ts.map +1 -1
  23. package/lib/components/index.js +1 -0
  24. package/lib/components/index.js.map +1 -1
  25. package/lib/components/info-panel/InfoPanel.d.ts.map +1 -1
  26. package/lib/components/info-panel/InfoPanel.js +18 -12
  27. package/lib/components/info-panel/InfoPanel.js.map +1 -1
  28. package/lib/components/selected-total/SelectedTotal.d.ts +7 -0
  29. package/lib/components/selected-total/SelectedTotal.d.ts.map +1 -0
  30. package/lib/components/selected-total/SelectedTotal.js +25 -0
  31. package/lib/components/selected-total/SelectedTotal.js.map +1 -0
  32. package/lib/components/selected-total/index.d.ts +2 -0
  33. package/lib/components/selected-total/index.d.ts.map +1 -0
  34. package/lib/components/selected-total/index.js +18 -0
  35. package/lib/components/selected-total/index.js.map +1 -0
  36. package/lib/components/toolbar/Toolbar.d.ts +5 -14
  37. package/lib/components/toolbar/Toolbar.d.ts.map +1 -1
  38. package/lib/components/toolbar/Toolbar.js +28 -13
  39. package/lib/components/toolbar/Toolbar.js.map +1 -1
  40. package/lib-esm/app/explorer/MeasurementExplorer.d.ts +2 -3
  41. package/lib-esm/app/explorer/MeasurementExplorer.d.ts.map +1 -1
  42. package/lib-esm/app/explorer/MeasurementExplorer.js +2 -2
  43. package/lib-esm/app/explorer/MeasurementExplorer.js.map +1 -1
  44. package/lib-esm/app/panels/measurements/MeasurementsPanel.d.ts.map +1 -1
  45. package/lib-esm/app/panels/measurements/MeasurementsPanel.js +2 -1
  46. package/lib-esm/app/panels/measurements/MeasurementsPanel.js.map +1 -1
  47. package/lib-esm/app/panels/measurements/MeasurementsTable.js +2 -2
  48. package/lib-esm/app/panels/measurements/MeasurementsTable.js.map +1 -1
  49. package/lib-esm/app-data/kinds/iv/IvMeasurement.d.ts +1 -2
  50. package/lib-esm/app-data/kinds/iv/IvMeasurement.d.ts.map +1 -1
  51. package/lib-esm/app-data/state/data/data.helpers.d.ts +3 -3
  52. package/lib-esm/components/button/Button.d.ts.map +1 -1
  53. package/lib-esm/components/button/Button.js +20 -14
  54. package/lib-esm/components/button/Button.js.map +1 -1
  55. package/lib-esm/components/color-picker/gradient-select/GradientSelect.js +2 -2
  56. package/lib-esm/components/color-picker/gradient-select/GradientSelect.js.map +1 -1
  57. package/lib-esm/components/header/PanelHeader.d.ts.map +1 -1
  58. package/lib-esm/components/header/PanelHeader.js +2 -19
  59. package/lib-esm/components/header/PanelHeader.js.map +1 -1
  60. package/lib-esm/components/index.d.ts +1 -0
  61. package/lib-esm/components/index.d.ts.map +1 -1
  62. package/lib-esm/components/index.js +1 -0
  63. package/lib-esm/components/index.js.map +1 -1
  64. package/lib-esm/components/info-panel/InfoPanel.d.ts.map +1 -1
  65. package/lib-esm/components/info-panel/InfoPanel.js +19 -13
  66. package/lib-esm/components/info-panel/InfoPanel.js.map +1 -1
  67. package/lib-esm/components/selected-total/SelectedTotal.d.ts +7 -0
  68. package/lib-esm/components/selected-total/SelectedTotal.d.ts.map +1 -0
  69. package/lib-esm/components/selected-total/SelectedTotal.js +22 -0
  70. package/lib-esm/components/selected-total/SelectedTotal.js.map +1 -0
  71. package/lib-esm/components/selected-total/index.d.ts +2 -0
  72. package/lib-esm/components/selected-total/index.d.ts.map +1 -0
  73. package/lib-esm/components/selected-total/index.js +2 -0
  74. package/lib-esm/components/selected-total/index.js.map +1 -0
  75. package/lib-esm/components/table/table_utils.d.ts +1 -1
  76. package/lib-esm/components/table/table_utils.d.ts.map +1 -1
  77. package/lib-esm/components/toolbar/Toolbar.d.ts +5 -14
  78. package/lib-esm/components/toolbar/Toolbar.d.ts.map +1 -1
  79. package/lib-esm/components/toolbar/Toolbar.js +28 -13
  80. package/lib-esm/components/toolbar/Toolbar.js.map +1 -1
  81. package/package.json +33 -31
  82. package/src/app/explorer/MeasurementExplorer.tsx +6 -4
  83. package/src/app/panels/measurements/MeasurementsPanel.tsx +2 -1
  84. package/src/app/panels/measurements/MeasurementsTable.tsx +4 -4
  85. package/src/app-data/kinds/iv/IvMeasurement.ts +1 -1
  86. package/src/components/button/Button.tsx +41 -28
  87. package/src/components/color-picker/gradient-select/GradientSelect.tsx +2 -2
  88. package/src/components/header/PanelHeader.tsx +2 -20
  89. package/src/components/index.ts +1 -0
  90. package/src/components/info-panel/InfoPanel.tsx +69 -45
  91. package/src/components/selected-total/SelectedTotal.tsx +32 -0
  92. package/src/components/selected-total/index.ts +1 -0
  93. package/src/components/toolbar/Toolbar.tsx +42 -32
@@ -0,0 +1,22 @@
1
+ import { jsx as _jsx } from "react/jsx-runtime";
2
+ export function SelectedTotal(props) {
3
+ const { total, count } = props;
4
+ return (_jsx("div", { style: {
5
+ whiteSpace: 'nowrap',
6
+ margin: 0,
7
+ }, children: formatCounterLabel(count, total) }));
8
+ }
9
+ function formatCounterLabel(count, total) {
10
+ const thinSpace = '\u2009';
11
+ if (count !== undefined && total !== undefined) {
12
+ return `[${thinSpace}${count}${thinSpace}/${thinSpace}${total}${thinSpace}]`;
13
+ }
14
+ if (count !== undefined) {
15
+ return `[${thinSpace}${count}${thinSpace}]`;
16
+ }
17
+ if (total !== undefined) {
18
+ return `[${thinSpace}${total}${thinSpace}]`;
19
+ }
20
+ return '';
21
+ }
22
+ //# sourceMappingURL=SelectedTotal.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SelectedTotal.js","sourceRoot":"","sources":["../../../src/components/selected-total/SelectedTotal.tsx"],"names":[],"mappings":";AAKA,MAAM,UAAU,aAAa,CAAC,KAAyB;IACrD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAC/B,OAAO,CACL,cACE,KAAK,EAAE;YACL,UAAU,EAAE,QAAQ;YACpB,MAAM,EAAE,CAAC;SACV,YAEA,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,GAC7B,CACP,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc,EAAE,KAAc;IACxD,MAAM,SAAS,GAAG,QAAQ,CAAC;IAC3B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/C,OAAO,IAAI,SAAS,GAAG,KAAK,GAAG,SAAS,IAAI,SAAS,GAAG,KAAK,GAAG,SAAS,GAAG,CAAC;IAC/E,CAAC;IACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,IAAI,SAAS,GAAG,KAAK,GAAG,SAAS,GAAG,CAAC;IAC9C,CAAC;IACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,IAAI,SAAS,GAAG,KAAK,GAAG,SAAS,GAAG,CAAC;IAC9C,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
@@ -0,0 +1,2 @@
1
+ export * from './SelectedTotal';
2
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/selected-total/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC"}
@@ -0,0 +1,2 @@
1
+ export * from './SelectedTotal';
2
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/selected-total/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import { type ColumnDef, type Row, type RowData } from '@tanstack/react-table';
2
2
  import type { ReactNode } from 'react';
3
3
  export type TableColumnDef<TData extends RowData, TValue = unknown> = ColumnDef<TData, TValue>;
4
- export declare function createTableColumnHelper<TData extends RowData>(): import("@tanstack/react-table").ColumnHelper<TData>;
4
+ export declare function createTableColumnHelper<TData extends RowData>(): import("@tanstack/table-core").ColumnHelper<TData>;
5
5
  export interface TableRowTrRendererProps<TData extends RowData> {
6
6
  row: Row<TData>;
7
7
  children: ReactNode;
@@ -1 +1 @@
1
- {"version":3,"file":"table_utils.d.ts","sourceRoot":"","sources":["../../../src/components/table/table_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,GAAG,EACR,KAAK,OAAO,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,OAAO,EAAE,MAAM,GAAG,OAAO,IAAI,SAAS,CAC7E,KAAK,EACL,MAAM,CACP,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,OAAO,yDAE5D;AAED,MAAM,WAAW,uBAAuB,CAAC,KAAK,SAAS,OAAO;IAC5D,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAChB,QAAQ,EAAE,SAAS,CAAC;CACrB;AACD,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,OAAO,IAAI,CACtD,KAAK,EAAE,uBAAuB,CAAC,KAAK,CAAC,KAClC,SAAS,CAAC"}
1
+ {"version":3,"file":"table_utils.d.ts","sourceRoot":"","sources":["../../../src/components/table/table_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,GAAG,EACR,KAAK,OAAO,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,OAAO,EAAE,MAAM,GAAG,OAAO,IAAI,SAAS,CAC7E,KAAK,EACL,MAAM,CACP,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,OAAO,wDAE5D;AAED,MAAM,WAAW,uBAAuB,CAAC,KAAK,SAAS,OAAO;IAC5D,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAChB,QAAQ,EAAE,SAAS,CAAC;CACrB;AACD,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,OAAO,IAAI,CACtD,KAAK,EAAE,uBAAuB,CAAC,KAAK,CAAC,KAClC,SAAS,CAAC"}
@@ -1,31 +1,22 @@
1
1
  /** @jsxImportSource @emotion/react */
2
- import { Intent, PopoverProps, TagProps, TooltipProps } from '@blueprintjs/core';
3
- import { IconName } from '@blueprintjs/icons';
4
- import { type MouseEvent, type ReactElement, type ReactNode } from 'react';
2
+ import { ButtonGroupProps, Intent, PopoverProps, TooltipProps } from '@blueprintjs/core';
3
+ import { MouseEvent } from 'react';
4
+ import { ButtonProps } from '../button';
5
5
  export type PopoverInteractionType = 'click' | 'hover' | 'click-target' | 'hover-target';
6
6
  interface ToolbarBaseProps {
7
7
  intent?: Intent;
8
8
  disabled?: boolean;
9
9
  }
10
- export interface ToolbarProps extends ToolbarBaseProps {
11
- vertical?: boolean;
12
- large?: boolean;
13
- children?: Array<ReactElement<ToolbarItemProps>> | ReactElement<ToolbarItemProps> | Iterable<ReactNode> | boolean | null;
10
+ export interface ToolbarProps extends ToolbarBaseProps, Pick<ButtonGroupProps, 'children' | 'minimal' | 'large' | 'vertical' | 'fill'> {
14
11
  popoverInteractionKind?: PopoverInteractionType;
15
12
  }
16
- export interface ToolbarItemProps extends ToolbarBaseProps {
17
- id?: string;
13
+ export interface ToolbarItemProps extends ToolbarBaseProps, Pick<ButtonProps, 'id' | 'icon' | 'active' | 'tag' | 'tagProps'> {
18
14
  tooltip?: TooltipProps['content'];
19
15
  tooltipProps?: Omit<TooltipProps, 'content'>;
20
- icon: IconName | ReactElement;
21
- active?: boolean;
22
16
  onClick?: (item: ToolbarItemProps & {
23
17
  event: MouseEvent;
24
18
  }) => void;
25
- className?: string;
26
19
  isPopover?: boolean;
27
- tag?: ReactNode;
28
- tagProps?: Omit<TagProps, 'children'>;
29
20
  }
30
21
  export interface ToolbarPopoverItemProps extends PopoverProps {
31
22
  itemProps: ToolbarItemProps;
@@ -1 +1 @@
1
- {"version":3,"file":"Toolbar.d.ts","sourceRoot":"","sources":["../../../src/components/toolbar/Toolbar.tsx"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,OAAO,EAKL,MAAM,EAEN,YAAY,EACZ,QAAQ,EACR,YAAY,EACb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,SAAS,EAIf,MAAM,OAAO,CAAC;AAUf,MAAM,MAAM,sBAAsB,GAC9B,OAAO,GACP,OAAO,GACP,cAAc,GACd,cAAc,CAAC;AAEnB,UAAU,gBAAgB;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AACD,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EACL,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,GACrC,YAAY,CAAC,gBAAgB,CAAC,GAC9B,QAAQ,CAAC,SAAS,CAAC,GACnB,OAAO,GACP,IAAI,CAAC;IACT,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IAClC,YAAY,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAC7C,IAAI,EAAE,QAAQ,GAAG,YAAY,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,CACR,IAAI,EAAE,gBAAgB,GAAG;QACvB,KAAK,EAAE,UAAU,CAAC;KACnB,KACE,IAAI,CAAC;IACV,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,uBAAwB,SAAQ,YAAY;IAC3D,SAAS,EAAE,gBAAgB,CAAC;CAC7B;AAID,wBAAgB,OAAO,CAAC,KAAK,EAAE,YAAY,oDA+D1C;yBA/De,OAAO;sBAiEoB,gBAAgB;6BAgGlD,uBAAuB"}
1
+ {"version":3,"file":"Toolbar.d.ts","sourceRoot":"","sources":["../../../src/components/toolbar/Toolbar.tsx"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,OAAO,EAEL,gBAAgB,EAIhB,MAAM,EAEN,YAAY,EACZ,YAAY,EACb,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAEL,UAAU,EAKX,MAAM,OAAO,CAAC;AAEf,OAAO,EAAU,WAAW,EAAE,MAAM,WAAW,CAAC;AAQhD,MAAM,MAAM,sBAAsB,GAC9B,OAAO,GACP,OAAO,GACP,cAAc,GACd,cAAc,CAAC;AAEnB,UAAU,gBAAgB;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AACD,MAAM,WAAW,YACf,SAAQ,gBAAgB,EACtB,IAAI,CACF,gBAAgB,EAChB,UAAU,GAAG,SAAS,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CACvD;IACH,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD;AAED,MAAM,WAAW,gBACf,SAAQ,gBAAgB,EACtB,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,GAAG,UAAU,CAAC;IAClE,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IAClC,YAAY,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,CACR,IAAI,EAAE,gBAAgB,GAAG;QACvB,KAAK,EAAE,UAAU,CAAC;KACnB,KACE,IAAI,CAAC;IACV,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,uBAAwB,SAAQ,YAAY;IAC3D,SAAS,EAAE,gBAAgB,CAAC;CAC7B;AAID,wBAAgB,OAAO,CAAC,KAAK,EAAE,YAAY,oDAyE1C;yBAzEe,OAAO;sBA2EoB,gBAAgB;6BA2GlD,uBAAuB"}
@@ -7,8 +7,14 @@ import { Button } from '../button';
7
7
  import { toolbarContext, useToolbarContext, } from './toolbarContext';
8
8
  const border = '1px solid rgb(247, 247, 247)';
9
9
  export function Toolbar(props) {
10
- const { children, disabled, intent, large, vertical, popoverInteractionKind, } = props;
11
- const contextValue = useMemo(() => ({ intent, large, vertical, disabled, popoverInteractionKind }), [intent, large, vertical, disabled, popoverInteractionKind]);
10
+ const { children, disabled, intent, large, vertical, popoverInteractionKind, minimal, fill, } = props;
11
+ const contextValue = useMemo(() => ({
12
+ intent,
13
+ large,
14
+ vertical,
15
+ disabled,
16
+ popoverInteractionKind,
17
+ }), [intent, large, vertical, disabled, popoverInteractionKind]);
12
18
  const ref = useRef(null);
13
19
  // Work around wrong width on vertical flex when wrapping
14
20
  // In Chrome: recently fixed (https://bugs.chromium.org/p/chromium/issues/detail?id=507397)
@@ -38,46 +44,56 @@ export function Toolbar(props) {
38
44
  return () => observer.unobserve(element);
39
45
  }
40
46
  }, [vertical]);
41
- return (_jsx(ToolbarProvider, { value: contextValue, children: _jsx(ButtonGroup
42
- // Reset because of layout effect above
43
- // TODO: remove once the workaround is no longer needed
44
- , { vertical: vertical, large: large, style: {
47
+ return (_jsx(ToolbarProvider, { value: contextValue, children: _jsx(ButtonGroup, { fill: fill, vertical: vertical, large: large, minimal: minimal, style: {
45
48
  flexWrap: 'wrap',
46
49
  borderRight: vertical ? border : undefined,
47
50
  }, children: children }, String(vertical)) }));
48
51
  }
49
52
  Toolbar.Item = function ToolbarItem(props) {
50
- const { active = false, icon, onClick, tooltip, tooltipProps, id, intent: itemIntent, disabled: itemDisabled, isPopover, ...other } = props;
53
+ const { active = false, icon, onClick, tooltip, tooltipProps, intent: itemIntent, disabled: itemDisabled, isPopover, ...other } = props;
51
54
  const { intent: toolbarIntent, disabled: toolbarDisabled, large, vertical, } = useToolbarContext();
52
55
  const intent = itemIntent ?? toolbarIntent;
53
56
  const disabled = itemDisabled ?? toolbarDisabled;
54
- const resizedIcon = typeof icon === 'string'
57
+ const resizedIcon = !icon || typeof icon === 'string'
55
58
  ? icon
56
59
  : cloneElement(icon, {
57
60
  className: icon.props.className
58
61
  ? `${icon.props.className} bp5-icon`
59
62
  : 'bp5-icon',
60
63
  });
61
- return (_jsx(Button, { alignText: isPopover ? 'left' : undefined, minimal: true, disabled: disabled, css: css `
64
+ return (_jsx(Button, { alignText: isPopover ? 'left' : undefined, disabled: disabled, css: css `
62
65
  .${Classes.ICON} {
63
66
  color: ${Colors.DARK_GRAY3};
64
67
  }
68
+ .bp5-icon {
69
+ width: ${large ? '20px' : '16px'};
70
+ height: ${large ? '20px' : '16px'};
71
+ font-size: ${large ? '14px' : '12px'};
72
+ }
73
+ .bp5-tag {
74
+ font-size: ${large ? '12px' : '10px'};
75
+ line-height: ${large ? '14px' : '12px'};
76
+ min-width: ${large ? '18px' : '15px'};
77
+ min-height: ${large ? '18px' : '15px'};
78
+ }
65
79
  `, intent: intent, style: {
66
80
  position: 'relative',
67
81
  fontSize: '1.125em',
68
82
  width: 'fit-content',
69
- flex: 'none',
70
83
  }, type: "button", active: active, icon: _jsxs("div", { style: {
71
84
  display: 'flex',
72
85
  justifyContent: 'center',
73
86
  alignItems: 'center',
74
87
  width: 0,
75
88
  height: 0,
76
- }, children: [_jsx(Icon, { icon: resizedIcon }), isPopover && (_jsx(Icon, { icon: "caret-right", size: large ? 14 : 9, style: {
89
+ marginRight: 0,
90
+ }, children: [_jsx(Icon, { icon: resizedIcon, size: large ? 20 : 16 }), isPopover && (_jsx(Icon, { icon: "caret-right", size: large ? 14 : 9, style: {
77
91
  transform: 'rotate(45deg)',
78
92
  position: 'absolute',
79
93
  bottom: 0,
80
94
  right: 0,
95
+ width: large ? 14 : 9,
96
+ height: large ? 14 : 9,
81
97
  } }))] }), onClick: (event) => {
82
98
  onClick?.({ event, ...props });
83
99
  }, tooltipProps: !tooltip
@@ -104,9 +120,8 @@ Toolbar.PopoverItem = function ToolbarPopoverItem(props) {
104
120
  fontSize: '1.125em',
105
121
  width: 'fit-content',
106
122
  height: 'fit-content',
107
- flex: 'none',
108
123
  },
109
- }, ...other, children: _jsx(Toolbar.Item, { isPopover: true, ...itemProps }) }));
124
+ }, renderTarget: () => _jsx(Toolbar.Item, { isPopover: true, ...itemProps }), ...other }));
110
125
  };
111
126
  function ToolbarProvider(props) {
112
127
  return (_jsx(toolbarContext.Provider, { value: props.value, children: props.children }));
@@ -1 +1 @@
1
- {"version":3,"file":"Toolbar.js","sourceRoot":"","sources":["../../../src/components/toolbar/Toolbar.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Toolbar.js","sourceRoot":"","sources":["../../../src/components/toolbar/Toolbar.tsx"],"names":[],"mappings":";AAAA,sCAAsC;AACtC,OAAO,EACL,WAAW,EAEX,OAAO,EACP,MAAM,EACN,IAAI,EAEJ,OAAO,GAGR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EACL,YAAY,EAGZ,eAAe,EACf,OAAO,EACP,MAAM,GACP,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,MAAM,EAAe,MAAM,WAAW,CAAC;AAEhD,OAAO,EAEL,cAAc,EACd,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAsC1B,MAAM,MAAM,GAAG,8BAA8B,CAAC;AAE9C,MAAM,UAAU,OAAO,CAAC,KAAmB;IACzC,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,KAAK,EACL,QAAQ,EACR,sBAAsB,EACtB,OAAO,EACP,IAAI,GACL,GAAG,KAAK,CAAC;IAEV,MAAM,YAAY,GAAG,OAAO,CAC1B,GAAG,EAAE,CAAC,CAAC;QACL,MAAM;QACN,KAAK;QACL,QAAQ;QACR,QAAQ;QACR,sBAAsB;KACvB,CAAC,EACF,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,sBAAsB,CAAC,CAC5D,CAAC;IACF,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAEzC,yDAAyD;IACzD,2FAA2F;IAC3F,uFAAuF;IACvF,gCAAgC;IAChC,eAAe,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QACD,SAAS,MAAM;YACb,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC;YAClD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO;YACT,CAAC;YACD,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC;YACpC,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;YACpD,MAAM,YAAY,GAAG,WAAW,CAAC,qBAAqB,EAAE,CAAC;YACzD,MAAM,KAAK,GAAG,GAAG,YAAY,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,IAAI,CAAC;YACvD,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBACtC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;YAClC,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;YAC5C,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC1B,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,OAAO,CACL,KAAC,eAAe,IAAC,KAAK,EAAE,YAAY,YAClC,KAAC,WAAW,IACV,IAAI,EAAE,IAAI,EAIV,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE;gBACL,QAAQ,EAAE,MAAM;gBAChB,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;aAC3C,YAEA,QAAQ,IATJ,MAAM,CAAC,QAAQ,CAAC,CAUT,GACE,CACnB,CAAC;AACJ,CAAC;AAED,OAAO,CAAC,IAAI,GAAG,SAAS,WAAW,CAAC,KAAuB;IACzD,MAAM,EACJ,MAAM,GAAG,KAAK,EACd,IAAI,EACJ,OAAO,EACP,OAAO,EACP,YAAY,EACZ,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,YAAY,EACtB,SAAS,EACT,GAAG,KAAK,EACT,GAAG,KAAK,CAAC;IAEV,MAAM,EACJ,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,eAAe,EACzB,KAAK,EACL,QAAQ,GACT,GAAG,iBAAiB,EAAE,CAAC;IACxB,MAAM,MAAM,GAAG,UAAU,IAAI,aAAa,CAAC;IAC3C,MAAM,QAAQ,GAAG,YAAY,IAAI,eAAe,CAAC;IACjD,MAAM,WAAW,GACf,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAC/B,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE;YACjB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;gBAC7B,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,WAAW;gBACpC,CAAC,CAAC,UAAU;SACf,CAAC,CAAC;IAET,OAAO,CACL,KAAC,MAAM,IACL,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EACzC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,GAAG,CAAA;WACH,OAAO,CAAC,IAAI;mBACJ,MAAM,CAAC,UAAU;;;mBAGjB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;oBACtB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;uBACpB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;;;uBAGvB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;yBACrB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;uBACzB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;wBACtB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;;OAExC,EACD,MAAM,EAAE,MAAM,EACd,KAAK,EAAE;YACL,QAAQ,EAAE,UAAU;YACpB,QAAQ,EAAE,SAAS;YACnB,KAAK,EAAE,aAAa;SACrB,EACD,IAAI,EAAC,QAAQ,EACb,MAAM,EAAE,MAAM,EACd,IAAI,EACF,eACE,KAAK,EAAE;gBACL,OAAO,EAAE,MAAM;gBACf,cAAc,EAAE,QAAQ;gBACxB,UAAU,EAAE,QAAQ;gBACpB,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,CAAC;gBACT,WAAW,EAAE,CAAC;aACf,aAED,KAAC,IAAI,IAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAI,EACjD,SAAS,IAAI,CACZ,KAAC,IAAI,IACH,IAAI,EAAC,aAAa,EAClB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EACpB,KAAK,EAAE;wBACL,SAAS,EAAE,eAAe;wBAC1B,QAAQ,EAAE,UAAU;wBACpB,MAAM,EAAE,CAAC;wBACT,KAAK,EAAE,CAAC;wBACR,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;wBACrB,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;qBACvB,GACD,CACH,IACG,EAER,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;QACjC,CAAC,EACD,YAAY,EACV,CAAC,OAAO;YACN,CAAC,CAAC,SAAS;YACX,CAAC,CAAC;gBACE,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;gBACxC,MAAM;gBACN,OAAO,EAAE,CAAC,KAAK;gBACf,eAAe,EAAE,OAAO;gBACxB,GAAG,YAAY;aAChB,KAEH,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,OAAO,CAAC,WAAW,GAAG,SAAS,kBAAkB,CAC/C,KAA8B;IAE9B,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;IACtC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,sBAAsB,EAAE,GAAG,iBAAiB,EAAE,CAAC;IAE3E,OAAO,CACL,KAAC,OAAO,IACN,OAAO,QACP,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,EACpD,eAAe,EAAE,sBAAsB,EACvC,WAAW,QACX,eAAe,EAAE,CAAC,EAClB,GAAG,EAAE,GAAG,CAAA;WACH,OAAO,CAAC,IAAI;mBACJ,MAAM,CAAC,UAAU;;OAE7B,EACD,WAAW,EAAE;YACX,KAAK,EAAE;gBACL,QAAQ,EAAE,UAAU;gBACpB,QAAQ,EAAE,SAAS;gBACnB,KAAK,EAAE,aAAa;gBACpB,MAAM,EAAE,aAAa;aACtB;SACF,EACD,YAAY,EAAE,GAAG,EAAE,CAAC,KAAC,OAAO,CAAC,IAAI,IAAC,SAAS,WAAK,SAAS,GAAI,KACzD,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,eAAe,CAAC,KAGxB;IACC,OAAO,CACL,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,CAAC,KAAK,YACxC,KAAK,CAAC,QAAQ,GACS,CAC3B,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-science",
3
- "version": "6.0.1",
3
+ "version": "7.0.0",
4
4
  "description": "React components to build scientific applications UI",
5
5
  "exports": {
6
6
  "./app": {
@@ -51,7 +51,7 @@
51
51
  "test-only": "vitest run --coverage "
52
52
  },
53
53
  "volta": {
54
- "node": "20.16.0"
54
+ "node": "20.17.0"
55
55
  },
56
56
  "overrides": {
57
57
  "react": "^18.3.1",
@@ -65,32 +65,32 @@
65
65
  "react-dom": ">=18.0.0"
66
66
  },
67
67
  "dependencies": {
68
- "@blueprintjs/select": "^5.2.2",
69
- "@emotion/react": "^11.13.0",
68
+ "@blueprintjs/select": "^5.2.4",
69
+ "@emotion/react": "^11.13.3",
70
70
  "@emotion/styled": "^11.13.0",
71
71
  "@lukeed/uuid": "^2.0.1",
72
72
  "@popperjs/core": "^2.11.8",
73
73
  "@radix-ui/react-collapsible": "^1.1.0",
74
74
  "@radix-ui/react-radio-group": "^1.2.0",
75
75
  "@radix-ui/react-select": "^2.1.1",
76
- "@tanstack/react-query": "^5.51.15",
77
- "@tanstack/react-table": "^8.19.3",
76
+ "@tanstack/react-query": "^5.56.2",
77
+ "@tanstack/react-table": "^8.20.5",
78
78
  "biologic-converter": "^0.6.0",
79
- "cheminfo-types": "^1.7.3",
79
+ "cheminfo-types": "^1.8.0",
80
80
  "d3-scale-chromatic": "^3.1.0",
81
81
  "filelist-utils": "^1.11.1",
82
82
  "immer": "^10.1.1",
83
83
  "jcampconverter": "^9.6.4",
84
84
  "lodash": "^4.17.21",
85
- "ml-gsd": "^12.1.6",
86
- "ml-peak-shape-generator": "^4.1.2",
85
+ "ml-gsd": "^12.1.8",
86
+ "ml-peak-shape-generator": "^4.1.4",
87
87
  "ml-signal-processing": "^1.0.4",
88
- "ml-spectra-processing": "^14.5.1",
89
- "ms-spectrum": "^3.6.2",
88
+ "ml-spectra-processing": "^14.5.3",
89
+ "ms-spectrum": "^3.6.6",
90
90
  "netcdfjs": "^3.0.0",
91
91
  "react-d3-utils": "^1.0.0",
92
92
  "react-dropzone": "^14.2.3",
93
- "react-icons": "^5.2.1",
93
+ "react-icons": "^5.3.0",
94
94
  "react-inspector": "^6.0.2",
95
95
  "react-plot": "^2.0.0",
96
96
  "react-popper": "^2.3.0",
@@ -100,31 +100,33 @@
100
100
  "wdf-parser": "^0.3.0"
101
101
  },
102
102
  "devDependencies": {
103
- "@babel/core": "^7.24.9",
103
+ "@babel/core": "^7.25.2",
104
+ "@babel/preset-env": "^7.25.4",
104
105
  "@babel/preset-react": "^7.24.7",
105
- "@blueprintjs/core": "^5.11.0",
106
- "@blueprintjs/icons": "^5.11.0",
107
- "@playwright/experimental-ct-react": "^1.45.3",
108
- "@playwright/test": "^1.45.3",
109
- "@storybook/addon-essentials": "^8.2.6",
110
- "@storybook/addon-storysource": "^8.2.6",
111
- "@storybook/blocks": "^8.2.6",
112
- "@storybook/react": "^8.2.6",
113
- "@storybook/react-vite": "^8.2.6",
106
+ "@babel/preset-typescript": "^7.24.7",
107
+ "@blueprintjs/core": "^5.13.0",
108
+ "@blueprintjs/icons": "^5.13.0",
109
+ "@playwright/experimental-ct-react": "^1.47.2",
110
+ "@playwright/test": "^1.47.2",
111
+ "@storybook/addon-essentials": "^8.3.3",
112
+ "@storybook/addon-storysource": "^8.3.3",
113
+ "@storybook/blocks": "^8.3.3",
114
+ "@storybook/react": "^8.3.3",
115
+ "@storybook/react-vite": "^8.3.3",
114
116
  "@types/babel__core": "^7.20.5",
115
117
  "@types/d3-scale-chromatic": "^3.0.3",
116
- "@types/lodash": "^4.17.7",
117
- "@types/react": "^18.3.3",
118
+ "@types/lodash": "^4.17.9",
119
+ "@types/react": "^18.3.10",
118
120
  "@types/react-dom": "^18.3.0",
119
121
  "@types/react-inspector": "^4.0.6",
120
122
  "@types/tinycolor2": "^1.4.6",
121
123
  "@vitejs/plugin-react": "^4.3.1",
122
- "@vitest/coverage-v8": "^2.0.4",
124
+ "@vitest/coverage-v8": "^2.1.1",
123
125
  "cheminfo-font": "^1.13.0",
124
126
  "cross-env": "^7.0.3",
125
127
  "eslint": "^8.57.0",
126
- "eslint-config-zakodium": "^11.2.0",
127
- "eslint-plugin-storybook": "^0.8.0",
128
+ "eslint-config-zakodium": "^12.0.0",
129
+ "eslint-plugin-storybook": "^0.9.0",
128
130
  "fifo-logger": "^1.0.0",
129
131
  "prettier": "^3.3.3",
130
132
  "react": "^18.3.1",
@@ -133,10 +135,10 @@
133
135
  "react-kbs": "^2.1.1",
134
136
  "react-ocl": "^6.1.0",
135
137
  "rimraf": "^6.0.1",
136
- "storybook": "^8.2.6",
137
- "typescript": "^5.5.4",
138
- "vite": "^5.3.5",
139
- "vitest": "^2.0.4"
138
+ "storybook": "^8.3.3",
139
+ "typescript": "^5.6.2",
140
+ "vite": "^5.4.8",
141
+ "vitest": "^2.1.1"
140
142
  },
141
143
  "repository": {
142
144
  "type": "git",
@@ -1,11 +1,13 @@
1
1
  import styled from '@emotion/styled';
2
2
  import { useMemo, useState } from 'react';
3
- import { FaExchangeAlt, FaArrowsAltH } from 'react-icons/fa';
3
+ import { FaArrowsAltH, FaExchangeAlt } from 'react-icons/fa';
4
4
 
5
- import { MeasurementPlot, MeasurementPlotProps } from '../helpers/index';
5
+ import { MeasurementPlot, MeasurementPlotProps } from '../helpers';
6
6
 
7
- export interface MeasurementExplorerProps
8
- extends Omit<MeasurementPlotProps, keyof ExplorerInfo> {}
7
+ export type MeasurementExplorerProps = Omit<
8
+ MeasurementPlotProps,
9
+ keyof ExplorerInfo
10
+ >;
9
11
  interface ExplorerInfo {
10
12
  dataIndex: number;
11
13
  xVariableName: string;
@@ -11,8 +11,9 @@ import {
11
11
  useAppState,
12
12
  } from '../../../app-data';
13
13
 
14
- import { MeasurementsTable, MeasurementPanelProvider } from '.';
14
+ import { MeasurementPanelProvider, MeasurementsTable } from '.';
15
15
 
16
+ // eslint-disable-next-line @typescript-eslint/unbound-method
16
17
  export function MeasurementsPanel({ openPanel }: PanelProps<object>) {
17
18
  const appState = useAppState();
18
19
  const { data, view } = appState;
@@ -279,11 +279,11 @@ function MeasurementsTableRow(props: MeasurementsTableRowProps) {
279
279
  onClick={() =>
280
280
  openPanel?.({
281
281
  title: item.info.file?.name ?? item.info.title,
282
- renderPanel: ({ closePanel }) => (
282
+ renderPanel: (props) => (
283
283
  <div>
284
284
  <PanelPreferencesToolbar
285
285
  title={item.info.file?.name ?? item.info.title}
286
- onClose={closePanel}
286
+ onClose={() => props.closePanel()}
287
287
  />
288
288
  <InfoPanel data={infoPanelData} title="" />
289
289
  </div>
@@ -297,11 +297,11 @@ function MeasurementsTableRow(props: MeasurementsTableRowProps) {
297
297
  onClick={() =>
298
298
  openPanel?.({
299
299
  title: item.info.file?.name ?? item.info.title,
300
- renderPanel: ({ closePanel }) => (
300
+ renderPanel: (props) => (
301
301
  <div>
302
302
  <PanelPreferencesToolbar
303
303
  title={item.info.file?.name ?? item.info.title}
304
- onClose={closePanel}
304
+ onClose={() => props.closePanel()}
305
305
  />
306
306
  <MeasurementConfigPanel />
307
307
  </div>
@@ -1,3 +1,3 @@
1
1
  import type { MeasurementBase } from '../../index';
2
2
 
3
- export interface IvMeasurement extends MeasurementBase {}
3
+ export type IvMeasurement = MeasurementBase;
@@ -4,13 +4,14 @@ import {
4
4
  AnchorButtonProps as BlueprintAnchorButtonProps,
5
5
  Button as BlueprintButton,
6
6
  ButtonProps as BlueprintButtonProps,
7
+ Icon,
7
8
  Tag,
8
9
  TagProps,
9
10
  Tooltip,
10
11
  TooltipProps,
11
12
  } from '@blueprintjs/core';
12
13
  import { css } from '@emotion/react';
13
- import { ReactNode } from 'react';
14
+ import { Fragment, ReactNode } from 'react';
14
15
 
15
16
  type BlueprintProps = {
16
17
  [key in keyof BlueprintButtonProps &
@@ -41,33 +42,45 @@ export function Button(props: ButtonProps) {
41
42
  content={content}
42
43
  {...otherToolTipProps}
43
44
  renderTarget={({ isOpen, ...targetProps }) => (
44
- <div style={{ position: 'relative' }}>
45
- {tag && (
46
- <Tag
47
- css={css`
48
- position: absolute;
49
- top: 0;
50
- left: 0;
51
- cursor: default;
52
- font-size: 0.875em;
53
- padding: 2px !important;
54
- min-height: 15px;
55
- min-width: 15px;
56
- line-height: 1em;
57
- text-align: center;
58
- z-index: 20;
59
- `}
60
- round
61
- intent="success"
62
- {...tagProps}
63
- >
64
- {tag}
65
- </Tag>
66
- )}
67
- <InnerButton {...targetProps} {...buttonProps} style={{}}>
68
- {children}
69
- </InnerButton>
70
- </div>
45
+ <InnerButton
46
+ css={css({
47
+ position: 'relative',
48
+ '.bp5-icon': !children && {
49
+ marginRight: '0',
50
+ },
51
+ })}
52
+ {...targetProps}
53
+ {...buttonProps}
54
+ icon={
55
+ <Fragment>
56
+ <Icon icon={buttonProps.icon} />
57
+ {tag && (
58
+ <Tag
59
+ css={css`
60
+ position: absolute;
61
+ top: 0;
62
+ left: 0;
63
+ cursor: default;
64
+ font-size: 0.875em;
65
+ padding: 2px !important;
66
+ min-height: 15px;
67
+ min-width: 15px;
68
+ line-height: 1em;
69
+ text-align: center;
70
+ z-index: 20;
71
+ `}
72
+ round
73
+ intent="success"
74
+ {...tagProps}
75
+ >
76
+ {tag}
77
+ </Tag>
78
+ )}
79
+ </Fragment>
80
+ }
81
+ >
82
+ {children}
83
+ </InnerButton>
71
84
  )}
72
85
  />
73
86
  );
@@ -1,8 +1,8 @@
1
1
  /** @jsxImportSource @emotion/react */
2
- import { css } from '@emotion/react';
3
- import styled from '@emotion/styled';
4
2
  import { Button, MenuItem } from '@blueprintjs/core';
5
3
  import { ItemRenderer, Select } from '@blueprintjs/select';
4
+ import { css } from '@emotion/react';
5
+ import styled from '@emotion/styled';
6
6
  import * as scaleChromatic from 'd3-scale-chromatic';
7
7
  import { FaChevronDown } from 'react-icons/fa';
8
8
 
@@ -3,6 +3,7 @@ import { css } from '@emotion/react';
3
3
  import { ReactNode } from 'react';
4
4
 
5
5
  import { Button } from '../button/Button';
6
+ import { SelectedTotal } from '../selected-total/SelectedTotal';
6
7
 
7
8
  const styles = {
8
9
  container: css({
@@ -21,12 +22,6 @@ const styles = {
21
22
  minWidth: 'auto',
22
23
  },
23
24
  }),
24
- counterLabel: css({
25
- margin: 0,
26
- textAlign: 'right',
27
- lineHeight: '22px',
28
- whiteSpace: 'nowrap',
29
- }),
30
25
  };
31
26
 
32
27
  interface PanelHeaderProps {
@@ -45,23 +40,10 @@ export function PanelHeader({
45
40
  return (
46
41
  <div css={styles.container}>
47
42
  <div css={styles.leftContainer}>{children}</div>
48
- <p css={styles.counterLabel}>{formatCounterLabel(current, total)}</p>
43
+ <SelectedTotal count={current} total={total} />
49
44
  {onClickSettings && (
50
45
  <Button color="black" minimal onClick={onClickSettings} icon="cog" />
51
46
  )}
52
47
  </div>
53
48
  );
54
49
  }
55
-
56
- function formatCounterLabel(current?: number, total?: number) {
57
- if (current !== undefined && total !== undefined) {
58
- return `${current} / ${total}`;
59
- }
60
- if (current !== undefined) {
61
- return `[ ${current} ]`;
62
- }
63
- if (total !== undefined) {
64
- return `[ ${total} ]`;
65
- }
66
- return '';
67
- }
@@ -14,4 +14,5 @@ export * from './split-pane/index';
14
14
  export * from './table/index';
15
15
  export * from './toolbar/index';
16
16
  export * from './utils/index';
17
+ export * from './selected-total/index';
17
18
  export * as ValueRenderers from './value-renderers/index';