@react5/ui 1.0.26 → 1.0.28

package/packages/lib/src/components/RangeSlider/RangeSlider.tsx

@@ -1,151 +1,151 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import './RangeSlider.scss';
-import '@react5/time-span/packages/lib/dist/index.css'
-import { bem } from '../../utils/bem';
-import clsx from 'clsx';
-import { FaArrowRightFromBracket, FaArrowRightToBracket } from "react-icons/fa6"
-import { IconButton } from '../IconButton';
-import { TimeSpanInput } from '@react5/time-span';
-
-interface RangeSliderProps {
-  min?: number;
-  max?: number;
-  step?: number;
-  from?: number;
-  to?: number;
-  pickFromLabel?: string;
-  pickToLabel?: string;
-  onPickTo?: () => void;
-  onPickFrom?: () => void;
-  onChange?: (from: number, to: number) => void;
-}
-const b = bem("range-slider")
-export const RangeSlider: React.FC<RangeSliderProps> = ({ min = 0, max = 1 * 60 * 60, step = 1, 
-  from = min, to = max, onChange, onPickFrom, onPickTo, pickFromLabel, pickToLabel }) => {
-  const [fromValue, setFromValue] = useState<number>(from);
-  const [toValue, setToValue] = useState<number>(to);
-  const trackRef = useRef<HTMLDivElement>(null);
-  const activeThumb = useRef<'min' | 'max' | null>(null);
-  const moveCallback = useCallback(
-    (x: number) => {
-      handleMove(x);
-    },
-    [],
-  )
-  
-  const getPercentage = (value: number) => ((value - min) / (max - min)) * 100;
-
-  const handleMove = (clientX: number) => {
-    if (!trackRef.current || !activeThumb.current) return;
-    
-    const trackRect = trackRef.current.getBoundingClientRect();
-    const position = clientX - trackRect.left;
-    const newPercentage = Math.min(Math.max(position / trackRect.width, 0), 1);
-    const newValue = Math.round((min + newPercentage * (max - min)) / step) * step;
-
-    if (activeThumb.current === 'min') {
-      if (newValue < toValue) {
-        setFromValue(newValue);
-      }
-    } else if (activeThumb.current === 'max') {
-      if (newValue > fromValue) {
-        setToValue(newValue);
-      }
-    }
-  };
-
-  const handleMouseUp = () => {
-    if (onChange) {
-      onChange(fromValue, toValue);
-    }
-    activeThumb.current = null;
-    document.removeEventListener('mousemove', handleMouseMove);
-    //document.removeEventListener('mouseup', handleMouseUp);
-  };
-
-  const handleMouseMove = (e: MouseEvent) => {
-    moveCallback(e.clientX);
-  };
-
-  const handleMouseDown = (thumb: 'min' | 'max') => (e: React.MouseEvent) => {
-    activeThumb.current = thumb;
-    handleMove(e.clientX);
-    document.addEventListener('mousemove', handleMouseMove);
-    //document.addEventListener('mouseup', handleMouseUp);
-  };
-  const handleFromValueChange = (v: number) => {
-    setFromValue(v);
-    onChange && onChange(v, toValue)
-  }
-  const handleToValueChange = (v: number) => {
-    setToValue(v)
-    onChange && onChange(fromValue, v)
-  }
-
-  useEffect(() => {
-    setFromValue(from);
-    setToValue(to);
-  }, [from, to]);
-
-  return (
-    <div className={b()}>
-      <div ref={trackRef} className={b("track")}>
-        <div
-          className={b("range")}
-          style={{
-            left: `${getPercentage(fromValue)}%`,
-            right: `${100 - getPercentage(toValue)}%`,
-          }}
-        />
-        <div
-          className={clsx(b("thumb"), b("thumb", "min"))}
-          style={{ left: `${getPercentage(fromValue)}%` }}
-          onMouseDown={handleMouseDown('min')}
-          onMouseUp={handleMouseUp}
-        />
-        <div
-          className={clsx(b("thumb"), b("thumb", "max"))}
-          style={{ left: `${getPercentage(toValue)}%` }}
-          onMouseDown={handleMouseDown('max')}
-          onMouseUp={handleMouseUp}
-        />
-      </div>
-      <div className={b("values")}>
-        <span className={b("value")}>
-          <TimeSpanInput 
-            className={b("value-field")} 
-            step={step || 2} 
-            value={fromValue} 
-            onChange={handleFromValueChange} 
-          />
-          <IconButton 
-            className={b("pick-button")} 
-            variant='round-outlined' 
-            title={pickFromLabel} 
-            onClick={onPickFrom}
-          >
-            <FaArrowRightFromBracket/>
-          </IconButton>
-        </span>
-        <span className={b("value")}>
-          <IconButton
-            className={b("pick-button")}
-            variant='round-outlined'
-            title={pickToLabel}
-            onClick={onPickTo}
-          >
-            <FaArrowRightToBracket/>
-          </IconButton>
-          <TimeSpanInput
-            className={b("value-field")}
-            step={step || 2}
-            value={toValue}
-            onChange={handleToValueChange}
-          />
-        </span>
-      </div>
-    </div>
-  );
-};
-
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import './RangeSlider.scss';
+import '@react5/time-span/packages/lib/dist/index.css'
+import { bem } from '../../utils/bem';
+import clsx from 'clsx';
+import { FaArrowRightFromBracket, FaArrowRightToBracket } from "react-icons/fa6"
+import { IconButton } from '../IconButton';
+import { TimeSpanInput } from '@react5/time-span';
+
+interface RangeSliderProps {
+  min?: number;
+  max?: number;
+  step?: number;
+  from?: number;
+  to?: number;
+  pickFromLabel?: string;
+  pickToLabel?: string;
+  onPickTo?: () => void;
+  onPickFrom?: () => void;
+  onChange?: (from: number, to: number) => void;
+}
+const b = bem("range-slider")
+export const RangeSlider: React.FC<RangeSliderProps> = ({ min = 0, max = 1 * 60 * 60, step = 1, 
+  from = min, to = max, onChange, onPickFrom, onPickTo, pickFromLabel, pickToLabel }) => {
+  const [fromValue, setFromValue] = useState<number>(from);
+  const [toValue, setToValue] = useState<number>(to);
+  const trackRef = useRef<HTMLDivElement>(null);
+  const activeThumb = useRef<'min' | 'max' | null>(null);
+  const moveCallback = useCallback(
+    (x: number) => {
+      handleMove(x);
+    },
+    [],
+  )
+  
+  const getPercentage = (value: number) => ((value - min) / (max - min)) * 100;
+
+  const handleMove = (clientX: number) => {
+    if (!trackRef.current || !activeThumb.current) return;
+    
+    const trackRect = trackRef.current.getBoundingClientRect();
+    const position = clientX - trackRect.left;
+    const newPercentage = Math.min(Math.max(position / trackRect.width, 0), 1);
+    const newValue = Math.round((min + newPercentage * (max - min)) / step) * step;
+
+    if (activeThumb.current === 'min') {
+      if (newValue < toValue) {
+        setFromValue(newValue);
+      }
+    } else if (activeThumb.current === 'max') {
+      if (newValue > fromValue) {
+        setToValue(newValue);
+      }
+    }
+  };
+
+  const handleMouseUp = () => {
+    if (onChange) {
+      onChange(fromValue, toValue);
+    }
+    activeThumb.current = null;
+    document.removeEventListener('mousemove', handleMouseMove);
+    //document.removeEventListener('mouseup', handleMouseUp);
+  };
+
+  const handleMouseMove = (e: MouseEvent) => {
+    moveCallback(e.clientX);
+  };
+
+  const handleMouseDown = (thumb: 'min' | 'max') => (e: React.MouseEvent) => {
+    activeThumb.current = thumb;
+    handleMove(e.clientX);
+    document.addEventListener('mousemove', handleMouseMove);
+    //document.addEventListener('mouseup', handleMouseUp);
+  };
+  const handleFromValueChange = (v: number) => {
+    setFromValue(v);
+    onChange && onChange(v, toValue)
+  }
+  const handleToValueChange = (v: number) => {
+    setToValue(v)
+    onChange && onChange(fromValue, v)
+  }
+
+  useEffect(() => {
+    setFromValue(from);
+    setToValue(to);
+  }, [from, to]);
+
+  return (
+    <div className={b()}>
+      <div ref={trackRef} className={b("track")}>
+        <div
+          className={b("range")}
+          style={{
+            left: `${getPercentage(fromValue)}%`,
+            right: `${100 - getPercentage(toValue)}%`,
+          }}
+        />
+        <div
+          className={clsx(b("thumb"), b("thumb", "min"))}
+          style={{ left: `${getPercentage(fromValue)}%` }}
+          onMouseDown={handleMouseDown('min')}
+          onMouseUp={handleMouseUp}
+        />
+        <div
+          className={clsx(b("thumb"), b("thumb", "max"))}
+          style={{ left: `${getPercentage(toValue)}%` }}
+          onMouseDown={handleMouseDown('max')}
+          onMouseUp={handleMouseUp}
+        />
+      </div>
+      <div className={b("values")}>
+        <span className={b("value")}>
+          <TimeSpanInput 
+            className={b("value-field")} 
+            step={step || 2} 
+            value={fromValue} 
+            onChange={handleFromValueChange} 
+          />
+          <IconButton 
+            className={b("pick-button")} 
+            variant='round-outlined' 
+            title={pickFromLabel} 
+            onClick={onPickFrom}
+          >
+            <FaArrowRightFromBracket/>
+          </IconButton>
+        </span>
+        <span className={b("value")}>
+          <IconButton
+            className={b("pick-button")}
+            variant='round-outlined'
+            title={pickToLabel}
+            onClick={onPickTo}
+          >
+            <FaArrowRightToBracket/>
+          </IconButton>
+          <TimeSpanInput
+            className={b("value-field")}
+            step={step || 2}
+            value={toValue}
+            onChange={handleToValueChange}
+          />
+        </span>
+      </div>
+    </div>
+  );
+};
+
 export default RangeSlider;

package/packages/lib/src/components/ResponsiveBar/ResponsiveBar.scss

@@ -1,72 +1,72 @@
-.r5ui-responsive-bar {
-  display: flex;
-  justify-content: right;
-  align-items: end;
-  margin: 0 1em;
-  &__container {
-    list-style: none;
-    padding: 0;
-    margin: 0;
-    display: flex;
-    flex-wrap: nowrap;
-    overflow: hidden;
-  }
-  &__item {
-    margin: 0;
-    display: flex;
-    align-items: center;
-    flex-shrink: 0;
-  }
-  &__expand-button {
-    display: none;
-    align-items: center;
-    border: none;
-    border-radius: 2em;
-    height: 2em;
-    width: 2em;
-    padding: 0;
-    margin-top: 0.5em;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    background-color: $menu_bg_color;
-    color: $menu_text_color;
-    cursor: pointer;
-    &:hover {
-      color: $primary_text_color_highlight;
-    }
-  }
-  // &__expand-button {
-  //   margin: 0;
-  //   padding: 0;
-  //   display: none;
-  //   background: none;
-  //   border: $border_size solid $primary_border_color;
-  //   border-radius: $border_radius;
-  //   width: 36px;
-  //   height: 36px;
-  //   cursor: pointer;
-  //   color: $menu_text_color;
-  //   flex-direction: row;
-  //   align-items: center;
-  //   justify-content: center;
-  // }
-}
-
-@media (max-width: 920px) {
-  .responsive-bar {
-    flex-direction: column;
-    &__container {
-      display: none;
-      flex-direction: column;
-      &--open {
-        display: flex;
-        align-items: end;
-      }
-    }
-    &__expand-button {
-      display: flex;
-    }
-  }
-}
-
+.r5ui-responsive-bar {
+  display: flex;
+  justify-content: right;
+  align-items: end;
+  margin: 0 1em;
+  &__container {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    display: flex;
+    flex-wrap: nowrap;
+    overflow: hidden;
+  }
+  &__item {
+    margin: 0;
+    display: flex;
+    align-items: center;
+    flex-shrink: 0;
+  }
+  &__expand-button {
+    display: none;
+    align-items: center;
+    border: none;
+    border-radius: 2em;
+    height: 2em;
+    width: 2em;
+    padding: 0;
+    margin-top: 0.5em;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    background-color: $menu_bg_color;
+    color: $menu_text_color;
+    cursor: pointer;
+    &:hover {
+      color: $primary_text_color_highlight;
+    }
+  }
+  // &__expand-button {
+  //   margin: 0;
+  //   padding: 0;
+  //   display: none;
+  //   background: none;
+  //   border: $border_size solid $primary_border_color;
+  //   border-radius: $border_radius;
+  //   width: 36px;
+  //   height: 36px;
+  //   cursor: pointer;
+  //   color: $menu_text_color;
+  //   flex-direction: row;
+  //   align-items: center;
+  //   justify-content: center;
+  // }
+}
+
+@media (max-width: 920px) {
+  .responsive-bar {
+    flex-direction: column;
+    &__container {
+      display: none;
+      flex-direction: column;
+      &--open {
+        display: flex;
+        align-items: end;
+      }
+    }
+    &__expand-button {
+      display: flex;
+    }
+  }
+}
+

package/packages/lib/src/components/ResponsiveBar/ResponsiveBar.tsx

@@ -1,39 +1,39 @@
-import { ReactNode, Children, useState, useEffect, useRef } from "react"
-import './ResponsiveBar.scss'
-import clsx from "clsx";
-import { bem } from '../../utils/bem';
-import { FaBars } from "react-icons/fa6";
-import { useClickOutside } from "../../hooks";
-
-export interface IResponsiveBarProps {
-  children: ReactNode
-  className?: string
-  expandClassName?: string
-  icon?: ReactNode
-}
-const b = bem("responsive-bar");
-export const ResponsiveBar = ({children, className, expandClassName, icon = <FaBars/>}: IResponsiveBarProps) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const buttonRef = useRef<HTMLButtonElement | null>(null);
-  const dropdownRef = useRef<HTMLUListElement | null>(null);
-  useClickOutside([buttonRef, dropdownRef], () => setIsOpen(false));
-
-  const toggleDropdown = () => setIsOpen((prevIsOpen: boolean) => !prevIsOpen);
-  return (<nav className={clsx(b(), className)}>
-    <button
-      className={clsx(b("expand-button"), expandClassName)}
-      onClick={toggleDropdown}
-      ref={buttonRef}>{icon}</button>
-    <ul 
-      className={clsx(b("container"), isOpen && b("container", "open"))}
-      ref={dropdownRef}
-    >
-      {
-        Children.map(children, (c, i) => (
-          <li key={i} className={b("item")}>{c}</li>
-        ))
-      }
-    </ul>
-  </nav>
-  )
+import { ReactNode, Children, useState, useEffect, useRef } from "react"
+import './ResponsiveBar.scss'
+import clsx from "clsx";
+import { bem } from '../../utils/bem';
+import { FaBars } from "react-icons/fa6";
+import { useClickOutside } from "../../hooks";
+
+export interface IResponsiveBarProps {
+  children: ReactNode
+  className?: string
+  expandClassName?: string
+  icon?: ReactNode
+}
+const b = bem("responsive-bar");
+export const ResponsiveBar = ({children, className, expandClassName, icon = <FaBars/>}: IResponsiveBarProps) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const buttonRef = useRef<HTMLButtonElement | null>(null);
+  const dropdownRef = useRef<HTMLUListElement | null>(null);
+  useClickOutside([buttonRef, dropdownRef], () => setIsOpen(false));
+
+  const toggleDropdown = () => setIsOpen((prevIsOpen: boolean) => !prevIsOpen);
+  return (<nav className={clsx(b(), className)}>
+    <button
+      className={clsx(b("expand-button"), expandClassName)}
+      onClick={toggleDropdown}
+      ref={buttonRef}>{icon}</button>
+    <ul 
+      className={clsx(b("container"), isOpen && b("container", "open"))}
+      ref={dropdownRef}
+    >
+      {
+        Children.map(children, (c, i) => (
+          <li key={i} className={b("item")}>{c}</li>
+        ))
+      }
+    </ul>
+  </nav>
+  )
 }

package/packages/lib/src/components/ScrollView/ScrollView.scss

@@ -1,21 +1,21 @@
-.r5ui-scroll-view {
-  display: flex;
-  height: 100%;
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  border: none;
-  background-color: transparent;
-  -webkit-overflow-scrolling: touch;
-
-  &__vertical {
-    flex-direction: column;
-    overflow-y: auto;
-    overflow-x: hidden;
-  }
-  &__horizontal {
-    flex-direction: row;
-    overflow-x: auto;
-    overflow-y: hidden;
-  }
+.r5ui-scroll-view {
+  display: flex;
+  height: 100%;
+  width: 100%;
+  padding: 0;
+  margin: 0;
+  border: none;
+  background-color: transparent;
+  -webkit-overflow-scrolling: touch;
+
+  &__vertical {
+    flex-direction: column;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+  &__horizontal {
+    flex-direction: row;
+    overflow-x: auto;
+    overflow-y: hidden;
+  }
 }

package/packages/lib/src/components/ScrollView/ScrollView.stories.tsx

@@ -1,17 +1,17 @@
-import type { Meta, StoryObj } from '@storybook/react';
-import { ScrollView } from './ScrollView';
-
-const meta: Meta<typeof ScrollView> = {
-  title: 'Example/ScrollView',
-  component: ScrollView,
-  argTypes: {
-    backgroundColor: { control: 'color' },
-  },
-} as Meta;
-export default meta;
-
-type Story = StoryObj<typeof ScrollView>;
-
-export const TextScrollView: Story = {
-  render: () => <ScrollView>Test</ScrollView>,
-};
+import type { Meta, StoryObj } from '@storybook/react';
+import { ScrollView } from './ScrollView';
+
+const meta: Meta<typeof ScrollView> = {
+  title: 'Example/ScrollView',
+  component: ScrollView,
+  argTypes: {
+    backgroundColor: { control: 'color' },
+  },
+} as Meta;
+export default meta;
+
+type Story = StoryObj<typeof ScrollView>;
+
+export const TextScrollView: Story = {
+  render: () => <ScrollView>Test</ScrollView>,
+};

package/packages/lib/src/components/ScrollView/ScrollView.test.tsx

@@ -1,12 +1,12 @@
-import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
-import '@testing-library/jest-dom';
-import { ScrollView } from './ScrollView';
-
-describe('ScrollView Component', () => {
-  test('renders the button with the correct label', () => {
-    render(<ScrollView>test</ScrollView>);
-    const div = screen.getByRole('ScrollView', { name: /click me/i });
-    expect(div).toBeInTheDocument();
-  });
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { ScrollView } from './ScrollView';
+
+describe('ScrollView Component', () => {
+  test('renders the button with the correct label', () => {
+    render(<ScrollView>test</ScrollView>);
+    const div = screen.getByRole('ScrollView', { name: /click me/i });
+    expect(div).toBeInTheDocument();
+  });
 });

package/packages/lib/src/components/ScrollView/ScrollView.tsx

@@ -1,19 +1,19 @@
-import { ReactNode } from 'react';
-import './ScrollView.scss'
-import clsx from 'clsx';
-import { bem } from '../../utils/bem';
-
-interface ScrollViewProps {
-  className?: string;
-  children: ReactNode;
-  orientation?: "vertical" | "horizontal";
-}
-const b = bem("scroll-view");
-export const ScrollView = ({children, className, orientation = "vertical"}: ScrollViewProps) => {
-  return (
-    <div className={clsx(b(), b(orientation), className)}>
-      {children}
-    </div>
-  )
-}
-export default ScrollView
+import { ReactNode } from 'react';
+import './ScrollView.scss'
+import clsx from 'clsx';
+import { bem } from '../../utils/bem';
+
+interface ScrollViewProps {
+  className?: string;
+  children: ReactNode;
+  orientation?: "vertical" | "horizontal";
+}
+const b = bem("scroll-view");
+export const ScrollView = ({children, className, orientation = "vertical"}: ScrollViewProps) => {
+  return (
+    <div className={clsx(b(), b(orientation), className)}>
+      {children}
+    </div>
+  )
+}
+export default ScrollView

package/packages/lib/src/components/ScrollView/index.tsx

@@ -1 +1 @@
-export * from "./ScrollView";
+export * from "./ScrollView";