react-science 0.33.0 → 0.35.0

package/lib-esm/components/toolbar/Toolbar.js

@@ -1,8 +1,8 @@
-import { jsx as _jsx } from "@emotion/react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 /** @jsxImportSource @emotion/react */
-import { ButtonGroup, Classes, Colors } from '@blueprintjs/core';
+import { ButtonGroup, Classes, Colors, Popover, Icon, } from '@blueprintjs/core';
 import { css } from '@emotion/react';
-import { useLayoutEffect, useMemo, useRef, } from 'react';
+import { cloneElement, useLayoutEffect, useMemo, useRef, } from 'react';
 import { Button } from '../index';
 import { toolbarContext, useToolbarContext, } from './toolbarContext';
 const border = '1px solid rgb(247, 247, 247)';
@@ -38,26 +38,47 @@ export function Toolbar(props) {
             return () => observer.unobserve(element);
         }
     }, [vertical]);
-    return (_jsx(ToolbarProvider, { value: contextValue, children: _jsx(ButtonGroup, { ref: ref, vertical: vertical, large: large, style: {
+    return (_jsx(ToolbarProvider, { value: contextValue, children: _jsx(ButtonGroup
+        // Reset because of layout effect above
+        // TODO: remove once the workaround is no longer needed
+        , { vertical: vertical, large: large, style: {
                 flexWrap: 'wrap',
                 borderRight: vertical ? border : undefined,
-            }, children: children }) }));
+            }, children: children }, String(vertical)) }));
 }
 Toolbar.Item = function ToolbarItem(props) {
-    const { active = false, icon, onClick, title, id, intent: itemIntent, disabled: itemDisabled, noTooltip = false, ...other } = props;
+    const { active = false, icon, onClick, title, id, intent: itemIntent, disabled: itemDisabled, noTooltip = false, isPopover, ...other } = props;
     const { intent: toolbarIntent, disabled: toolbarDisabled, large, vertical, } = useToolbarContext();
     const intent = itemIntent ?? toolbarIntent;
     const disabled = itemDisabled ?? toolbarDisabled;
-    return (_jsx(Button, { minimal: true, disabled: disabled, css: css `
+    const resizedIcon = typeof icon === 'string'
+        ? icon
+        : cloneElement(icon, {
+            className: icon.props.className
+                ? `${icon.props.className} bp5-icon`
+                : 'bp5-icon',
+        });
+    return (_jsx(Button, { alignText: isPopover ? 'left' : undefined, minimal: true, disabled: disabled, css: css `
         .${Classes.ICON} {
           color: ${Colors.DARK_GRAY3};
         }
       `, intent: intent, style: {
             position: 'relative',
-            fontSize: '1.25em',
+            fontSize: '1.125em',
             width: 'fit-content',
             flex: 'none',
-        }, type: "button", active: active, icon: icon, onClick: () => {
+        }, type: "button", active: active, icon: _jsxs("div", { style: {
+                display: 'flex',
+                justifyContent: 'center',
+                alignItems: 'center',
+                width: 0,
+                height: 0,
+            }, children: [_jsx(Icon, { icon: resizedIcon }), isPopover && (_jsx(Icon, { icon: "caret-right", size: large ? 14 : 9, style: {
+                        transform: 'rotate(45deg)',
+                        position: 'absolute',
+                        bottom: 0,
+                        right: 0,
+                    } }))] }), onClick: () => {
             onClick?.(props);
         }, tooltipProps: noTooltip
             ? undefined
@@ -68,6 +89,23 @@ Toolbar.Item = function ToolbarItem(props) {
                 compact: !large,
             }, ...other }));
 };
+Toolbar.PopoverItem = function ToolbarPopoverItem(props) {
+    const { itemProps, ...other } = props;
+    const { disabled, vertical } = useToolbarContext();
+    return (_jsx(Popover, { minimal: true, disabled: disabled, placement: vertical ? 'right-start' : 'bottom-start', css: css `
+        .${Classes.ICON} {
+          color: ${Colors.DARK_GRAY3};
+        }
+      `, targetProps: {
+            style: {
+                position: 'relative',
+                fontSize: '1.125em',
+                width: 'fit-content',
+                height: 'fit-content',
+                flex: 'none',
+            },
+        }, ...other, children: _jsx(Toolbar.Item, { noTooltip: true, isPopover: true, ...itemProps }) }));
+};
 function ToolbarProvider(props) {
     return (_jsx(toolbarContext.Provider, { value: props.value, children: props.children }));
 }

package/lib-esm/components/toolbar/Toolbar.js.map

@@ -1 +1 @@
-{"version":3,"file":"Toolbar.js","sourceRoot":"","sources":["../../../src/components/toolbar/Toolbar.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Toolbar.js","sourceRoot":"","sources":["../../../src/components/toolbar/Toolbar.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-science",
-  "version": "0.33.0",
+  "version": "0.35.0",
   "description": "React components to build scientific applications UI",
   "exports": {
     "./app": {

package/src/app/about/AboutDialogToolbarButton.tsx

@@ -1,11 +1,12 @@
-import { ButtonProps, Dialog, DialogBody } from '@blueprintjs/core';
-import { ReactNode } from 'react';
+import { Dialog, DialogBody } from '@blueprintjs/core';
+import { IconName } from '@blueprintjs/icons';
+import { JSX, ReactNode } from 'react';
 
 import { Toolbar, useOnOff } from '../../components';
 
 interface AboutDialogToolbarButtonProps {
   name: string;
-  icon: ButtonProps['icon'];
+  icon: IconName | JSX.Element;
   body: ReactNode;
 }
 

package/src/app/helpers/react-plot.tsx

@@ -111,6 +111,7 @@ export function BasicComponent(props: BasicComponentProps) {
               flip={flipHorizontalAxis}
               position="bottom"
               label={`${x.label}${x.units ? `(${x.units})` : ''}`}
+              paddingEnd="20"
             />
             <Axis
               hidden={!showVerticalAxis}

package/src/app/kinds/iv/plot-view/IvPlotVariablesSelector.tsx

@@ -28,7 +28,13 @@ export default function IvPlotVariablesSelector() {
 
   return (
     <div
-      style={{ display: 'flex', flexDirection: 'row', gap: 5, fontSize: 18 }}
+      style={{
+        display: 'flex',
+        flexDirection: 'row',
+
+        gap: 30,
+        fontSize: '1.125em',
+      }}
     >
       <MeasurementVariableSelect
         label="Y variable"

package/src/app/kinds/mass/MeasurementMassPlot.tsx

@@ -121,14 +121,14 @@ function MassComponent(props: MeasurementPlotProps) {
               style={{ strokeWidth: 2, stroke: 'blue' }}
             />
             <Annotation.Text
-              style={{ fontSize: '13px', fontWeight: '600' }}
+              style={{ fontSize: '0.875rem', fontWeight: '600' }}
               x="2"
               y="0"
             >
               {shortLabel}
             </Annotation.Text>
             <Annotation.Text
-              style={{ fontSize: '13px', fontWeight: '600' }}
+              style={{ fontSize: '0.875rem', fontWeight: '600' }}
               x="2"
               y="-14"
             >

package/src/app/panels/measurements/MeasurementColorPreview.tsx

@@ -13,7 +13,6 @@ import {
   useOnClickOutside,
   useOnOff,
 } from '../../../components/index';
-import { Portal } from '../../../components/root-layout/Portal';
 
 interface MeasurementColorPreviewProps {
   measurementId: string;
@@ -24,11 +23,12 @@ interface MeasurementColorPreviewProps {
 const ColorPreviewButton = styled.button`
   width: 1em;
   height: 1em;
+  & > div {
+    border-radius: 0.5em;
+  }
 `;
 
-export default function MeasurementColorPreview(
-  props: MeasurementColorPreviewProps,
-) {
+export function MeasurementColorPreview(props: MeasurementColorPreviewProps) {
   const { measurementId, kind, color } = props;
 
   const dispatch = useAppDispatch();
@@ -53,35 +53,33 @@ export default function MeasurementColorPreview(
         <ColorPreview color={color} />
       </ColorPreviewButton>
       {isOpened && (
-        <Portal>
-          <div
-            ref={(div) => {
-              setPopperElement(div);
-              ref.current = div;
-            }}
-            {...popperProps}
-          >
-            {color.kind === 'fixed' ? (
-              <FixedColorPicker
-                color={color.color}
-                onChange={(newColor) =>
-                  dispatch({
-                    type: 'CHANGE_MEASUREMENT_DISPLAY',
-                    payload: {
-                      display: {
-                        color: {
-                          kind: 'fixed',
-                          color: newColor,
-                        },
+        <div
+          ref={(div) => {
+            setPopperElement(div);
+            ref.current = div;
+          }}
+          {...popperProps}
+        >
+          {color.kind === 'fixed' ? (
+            <FixedColorPicker
+              color={color.color}
+              onChange={(newColor) =>
+                dispatch({
+                  type: 'CHANGE_MEASUREMENT_DISPLAY',
+                  payload: {
+                    display: {
+                      color: {
+                        kind: 'fixed',
+                        color: newColor,
                       },
-                      measurement: { id: measurementId, kind },
                     },
-                  })
-                }
-              />
-            ) : null}
-          </div>
-        </Portal>
+                    measurement: { id: measurementId, kind },
+                  },
+                })
+              }
+            />
+          ) : null}
+        </div>
       )}
     </>
   );
@@ -94,6 +92,7 @@ function FixedColorPicker(props: {
   const { color, onChange } = props;
   return (
     <ColorPicker
+      style={{ fontSize: '0.875em' }}
       color={{ hex: color }}
       onChangeComplete={(color) => {
         onChange(color.hex);

package/src/app/panels/measurements/MeasurementVisibilityToggle.tsx

@@ -1,15 +1,14 @@
-import { FaEye, FaEyeSlash } from 'react-icons/fa';
-
 import { useAppDispatch } from '../../../app-data/index';
+import { Button } from '../../../components/index';
 
-import { MeasurementsTableProps } from './MeasurementsTable';
+import { MeasurementsTableProps } from '.';
 
 interface MeasurementVisibilityToggleProps {
   id: string;
   isVisible: boolean;
 }
 
-export default function MeasurementVisibilityToggle(
+export function MeasurementVisibilityToggle(
   props: MeasurementVisibilityToggleProps,
 ) {
   const { id, isVisible } = props;
@@ -23,20 +22,22 @@ export default function MeasurementVisibilityToggle(
   }
 
   return isVisible ? (
-    <FaEye onClick={() => setVisibility(false)} style={{ cursor: 'pointer' }} />
+    <Button icon="eye-on" onClick={() => setVisibility(false)} minimal />
   ) : (
-    <FaEyeSlash
+    <Button
+      icon="eye-off"
       onClick={() => setVisibility(true)}
-      style={{ cursor: 'pointer', opacity: 0.6 }}
+      style={{ opacity: 0.6 }}
+      minimal
     />
   );
 }
 
 export function MeasurementSelectedVisibilityChange(props: {
-  openedEyes: boolean;
+  isVisible: boolean;
   kind: MeasurementsTableProps['kind'];
 }) {
-  const { kind, openedEyes } = props;
+  const { kind, isVisible } = props;
   const dispatch = useAppDispatch();
 
   function setVisibility(isVisible: boolean) {
@@ -46,12 +47,14 @@ export function MeasurementSelectedVisibilityChange(props: {
     });
   }
 
-  return openedEyes ? (
-    <FaEye onClick={() => setVisibility(false)} style={{ cursor: 'pointer' }} />
+  return isVisible ? (
+    <Button icon="eye-on" onClick={() => setVisibility(true)} minimal />
   ) : (
-    <FaEyeSlash
-      onClick={() => setVisibility(true)}
-      style={{ cursor: 'pointer', opacity: 0.6 }}
+    <Button
+      icon="eye-off"
+      onClick={() => setVisibility(false)}
+      style={{ opacity: 0.6 }}
+      minimal
     />
   );
 }

package/src/app/panels/measurements/MeasurementsPanel.tsx

@@ -1,6 +1,7 @@
 /** @jsxImportSource @emotion/react */
-import { Tab, Tabs } from '@blueprintjs/core';
+import { PanelProps, Tab, Tabs } from '@blueprintjs/core';
 import { css } from '@emotion/react';
+import { useMemo } from 'react';
 
 import {
   kindLabels,
@@ -10,9 +11,9 @@ import {
   useAppState,
 } from '../../../app-data';
 
-import { MeasurementsTable } from './MeasurementsTable';
+import { MeasurementsTable, MeasurementPanelProvider } from '.';
 
-export function MeasurementsPanel() {
+export function MeasurementsPanel({ openPanel }: PanelProps<object>) {
   const appState = useAppState();
   const { data, view } = appState;
 
@@ -36,34 +37,42 @@ export function MeasurementsPanel() {
       payload: id,
     });
   }
+  const measurementState = useMemo(
+    () => ({
+      openPanel,
+    }),
+    [openPanel],
+  );
 
   if (items.length > 0) {
     return (
-      <Tabs
-        selectedTabId={view.selectedKind}
-        onChange={handleTabSelection}
-        css={css`
-          div[role='tablist'] {
-            overflow-x: auto;
-            padding: 2px 0 0 1rem;
-            border-bottom: 1px solid gray;
-          }
-          div[role='tabpanel'] {
-            margin-top: 4px;
-          }
-        `}
-      >
-        {items.map((item) => (
-          <Tab
-            id={item.id}
-            key={item.id}
-            title={item.title}
-            panel={item.content}
-            tagContent={data.measurements[item.id].entries.length}
-            tagProps={{ round: true }}
-          />
-        ))}
-      </Tabs>
+      <MeasurementPanelProvider value={measurementState}>
+        <Tabs
+          selectedTabId={view.selectedKind}
+          onChange={handleTabSelection}
+          css={css`
+            div[role='tablist'] {
+              overflow-x: auto;
+              padding: 2px 0 0 1rem;
+              border-bottom: 1px solid gray;
+            }
+            div[role='tabpanel'] {
+              margin-top: 4px;
+            }
+          `}
+        >
+          {items.map((item) => (
+            <Tab
+              id={item.id}
+              key={item.id}
+              title={item.title}
+              panel={item.content}
+              tagContent={data.measurements[item.id].entries.length}
+              tagProps={{ round: true }}
+            />
+          ))}
+        </Tabs>
+      </MeasurementPanelProvider>
     );
   }
 

package/src/app/panels/measurements/MeasurementsPanelAccordion.tsx

@@ -1,3 +1,7 @@
+/** @jsxImportSource @emotion/react */
+import { PanelStack2 } from '@blueprintjs/core';
+import { css } from '@emotion/react';
+
 import {
   getExistingMeasurementKinds,
   kindLabels,
@@ -5,7 +9,7 @@ import {
 } from '../../../app-data/index';
 import { Accordion } from '../../../components/index';
 
-import { MeasurementsPanel } from './MeasurementsPanel';
+import { MeasurementsPanel } from '.';
 
 export function MeasurementsPanelAccordion() {
   const appData = useAppData();
@@ -16,7 +20,16 @@ export function MeasurementsPanelAccordion() {
       : 'Measurements';
   return (
     <Accordion.Item title={title} defaultOpened>
-      <MeasurementsPanel />
+      <PanelStack2
+        css={css`
+          height: 100%;
+        `}
+        initialPanel={{
+          renderPanel: MeasurementsPanel,
+        }}
+        showPanelHeader={false}
+        renderActivePanelOnly={false}
+      />
     </Accordion.Item>
   );
 }