- Everything seems to be working except z-index. Check StandardTable …

…header.
StenaIT · Aug 22, 2024 · 8d92f9e · 8d92f9e
1 parent cdadedd
commit 8d92f9e
Show file tree

Hide file tree

Showing 42 changed files with 762 additions and 1,385 deletions.
diff --git a/.storybook/manager.ts b/.storybook/manager.ts
diff --git a/package.json b/package.json
@@ -53,7 +53,6 @@
     "@storybook/addon-links": "^8.2.9",
     "@storybook/addon-mdx-gfm": "^8.2.9",
     "@storybook/addon-storysource": "^8.2.9",
-    "@storybook/addons": "^7.6.17",
     "@storybook/blocks": "^8.2.9",
     "@storybook/react": "^8.2.9",
     "@storybook/react-vite": "^8.2.9",

diff --git a/packages/calendar/src/components/calendar/CalendarMonth.tsx b/packages/calendar/src/components/calendar/CalendarMonth.tsx
@@ -1,5 +1,6 @@
 import { Box, Row, Text } from "@stenajs-webui/core";
 import * as React from "react";
+import { ReactNode } from "react";
 import {
   CalendarDayProps,
   CalendarOnClicks,
@@ -21,7 +22,6 @@ import { CalendarDay } from "./renderers/CalendarDay";
 import { FlatButton, stenaAngleDown } from "@stenajs-webui/elements";
 import { WeekNumberCell } from "./renderers/WeekNumberCell";
 import { DisabledDayWrapper } from "./DisabledDayWrapper";
-import { ReactNode } from "react";
 
 export interface CalendarMonthProps<T>
   extends CalendarOnClicks<T>,
@@ -106,48 +106,46 @@ export function CalendarMonth<T>({
               ))}
             </tr>
             {month.weeks.map((week: WeekData) => (
-              <>
-                <tr key={week.weekNumber}>
-                  {showWeekNumber && (
-                    <td>
-                      {renderWeekNumber ? (
-                        renderWeekNumber(week, theme, onClickWeek)
-                      ) : (
-                        <WeekNumberCell
-                          week={week}
-                          onClickWeek={onClickWeek}
-                          theme={theme}
-                        />
-                      )}
-                    </td>
-                  )}
-                  {week.days.map((day) => (
-                    <DisabledDayWrapper
-                      dayComponent={dayComponent}
-                      key={day.dateString}
-                      day={day}
-                      week={week}
-                      month={month}
-                      dayState={
-                        statePerWeek &&
-                        statePerWeek[week.weekNumber] &&
-                        statePerWeek[week.weekNumber][day.dayOfMonth]
-                      }
-                      userData={
-                        userDataPerWeek &&
-                        userDataPerWeek[week.weekNumber] &&
-                        userDataPerWeek[week.weekNumber][day.dayOfMonth]
-                      }
-                      onClickDay={onClickDay}
-                      theme={theme}
-                      extraDayContent={extraDayContent}
-                      defaultHighlights={defaultHighlights}
-                      minDate={minDate}
-                      maxDate={maxDate}
-                    />
-                  ))}
-                </tr>
-              </>
+              <tr key={week.weekNumber}>
+                {showWeekNumber && (
+                  <td>
+                    {renderWeekNumber ? (
+                      renderWeekNumber(week, theme, onClickWeek)
+                    ) : (
+                      <WeekNumberCell
+                        week={week}
+                        onClickWeek={onClickWeek}
+                        theme={theme}
+                      />
+                    )}
+                  </td>
+                )}
+                {week.days.map((day) => (
+                  <DisabledDayWrapper
+                    dayComponent={dayComponent}
+                    key={day.dateString}
+                    day={day}
+                    week={week}
+                    month={month}
+                    dayState={
+                      statePerWeek &&
+                      statePerWeek[week.weekNumber] &&
+                      statePerWeek[week.weekNumber][day.dayOfMonth]
+                    }
+                    userData={
+                      userDataPerWeek &&
+                      userDataPerWeek[week.weekNumber] &&
+                      userDataPerWeek[week.weekNumber][day.dayOfMonth]
+                    }
+                    onClickDay={onClickDay}
+                    theme={theme}
+                    extraDayContent={extraDayContent}
+                    defaultHighlights={defaultHighlights}
+                    minDate={minDate}
+                    maxDate={maxDate}
+                  />
+                ))}
+              </tr>
             ))}
           </tbody>
         </table>

diff --git a/packages/calendar/src/components/input-types/date-input/DateInput.tsx b/packages/calendar/src/components/input-types/date-input/DateInput.tsx
@@ -1,11 +1,10 @@
 import { Box } from "@stenajs-webui/core";
 import { stenaCalendar, TextInputButton } from "@stenajs-webui/elements";
 import { TextInput, TextInputProps } from "@stenajs-webui/forms";
-import { Popover } from "@stenajs-webui/tooltip";
+import { ControlledPopover } from "@stenajs-webui/tooltip";
 import { format } from "date-fns";
 import * as React from "react";
 import { defaultPopoverPlacement } from "../../../config/DefaultPopoverPlacement";
-import { useCalendarPopoverUpdater } from "../../../features/internal-panel-state/UseCalendarPopoverUpdater";
 import { DateFormats } from "../../../util/date/DateFormats";
 import { SingleDateCalendar } from "../../calendar-types/single-date-calendar/SingleDateCalendar";
 import {
@@ -42,16 +41,6 @@ export interface DateInputProps<T = unknown>
   /**
    *  Portal target, HTML element. If not set, portal is not used.
    */
-  portalTarget?: HTMLElement | null;
-  /**
-   * Z-index of the calendar overlay.
-   * @default 100
-   */
-  zIndex?: number;
-  /**
-   * Width of the input element.
-   * * @default 125px
-   */
   width?: string;
   /**
    * The calendar theme to use.
@@ -69,13 +58,11 @@ export const DateInput: React.FC<DateInputProps> = ({
   displayFormat = DateFormats.fullDate,
   placeholder = "Enter date",
   value,
-  zIndex = 100,
   calendarTheme = defaultCalendarTheme,
   calendarProps,
   openOnMount,
   onClose,
   onChange,
-  portalTarget,
   variant,
   width,
   minDate,
@@ -85,48 +72,42 @@ export const DateInput: React.FC<DateInputProps> = ({
   const { hideCalendar, showingCalendar, onSelectDate, showCalendar } =
     useDateInput(onChange, onClose, openOnMount);
 
-  const { tippyRef, onChangePanel } = useCalendarPopoverUpdater();
-
   return (
     <Box width={width}>
-      <Popover
-        arrow={false}
-        lazy
-        visible={showingCalendar}
-        onClickOutside={hideCalendar}
+      <ControlledPopover
+        hideArrow
+        open={showingCalendar}
+        onRequestClose={hideCalendar}
+        renderTrigger={(props) => (
+          <Box {...props}>
+            <TextInput
+              type={"date"}
+              onFocus={showCalendar}
+              buttonRight={
+                <TextInputButton onClick={showCalendar} icon={stenaCalendar} />
+              }
+              value={value ? format(value, displayFormat) : ""}
+              placeholder={placeholder}
+              size={9}
+              disabled={disabled}
+              autoFocus={openOnMount}
+              variant={variant}
+              min={minDate}
+              max={maxDate}
+            />
+          </Box>
+        )}
         placement={defaultPopoverPlacement}
-        zIndex={zIndex}
-        appendTo={portalTarget ?? "parent"}
-        tippyRef={tippyRef}
-        disabled={disabled}
-        content={
-          <SingleDateCalendar
-            {...calendarProps}
-            onChange={onSelectDate}
-            value={value}
-            theme={calendarTheme}
-            onChangePanel={onChangePanel}
-            minDate={minDate}
-            maxDate={maxDate}
-          />
-        }
       >
-        <TextInput
-          type={"date"}
-          onFocus={showCalendar}
-          buttonRight={
-            <TextInputButton onClick={showCalendar} icon={stenaCalendar} />
-          }
-          value={value ? format(value, displayFormat) : ""}
-          placeholder={placeholder}
-          size={9}
-          disabled={disabled}
-          autoFocus={openOnMount}
-          variant={variant}
-          min={minDate}
-          max={maxDate}
+        <SingleDateCalendar
+          {...calendarProps}
+          onChange={onSelectDate}
+          value={value}
+          theme={calendarTheme}
+          minDate={minDate}
+          maxDate={maxDate}
         />
-      </Popover>
+      </ControlledPopover>
     </Box>
   );
 };
diff --git a/...calendar/src/components/input-types/date-range-dual-text-input/DateRangeDualTextInput.tsx b/...calendar/src/components/input-types/date-range-dual-text-input/DateRangeDualTextInput.tsx
@@ -1,10 +1,10 @@
-import { Box, useDelayedFalse } from "@stenajs-webui/core";
+import { Box } from "@stenajs-webui/core";
 import { stenaArrowRight } from "@stenajs-webui/elements";
 import {
   TextInputProps,
   ValueAndOnValueChangeProps,
 } from "@stenajs-webui/forms";
-import { Popover } from "@stenajs-webui/tooltip";
+import { ControlledPopover } from "@stenajs-webui/tooltip";
 import { isAfter } from "date-fns";
 import * as React from "react";
 import { useMemo, useRef } from "react";
@@ -115,63 +115,61 @@ export function DateRangeDualTextInput<TData>({
     [calendarProps?.statePerMonth, startDate, endDate, dateInFocus]
   );
 
-  const delayedIsCalendarVisible = useDelayedFalse(isCalendarVisible, 300);
-
   return (
     <Box onKeyDown={onKeyDownHandler}>
-      <Popover
-        arrow={false}
-        lazy
-        disabled={disabled}
-        placement={defaultPopoverPlacement}
-        onClickOutside={hideCalendar}
-        visible={isCalendarVisible}
-        content={
-          delayedIsCalendarVisible && (
-            <CalendarWithMonthSwitcher
-              onClickDay={onClickDay}
-              dateInFocus={dateInFocus}
-              setDateInFocus={setDateInFocus}
-              currentPanel={currentPanel}
-              setCurrentPanel={setCurrentPanel}
-              minDate={minDate}
-              maxDate={maxDate}
-              {...calendarProps}
-              statePerMonth={statePerMonth}
+      <ControlledPopover
+        hideArrow
+        restoreFocus={false}
+        returnFocus={false}
+        renderTrigger={(props) => (
+          <Box {...props}>
+            <DualTextInput
+              autoFocusLeft={autoFocus}
+              onEsc={onEsc}
+              onEnter={onEnter}
+              onBlur={onBlur}
+              disabled={disabled}
+              separatorIcon={stenaArrowRight}
+              typeLeft={"date"}
+              typeRight={"date"}
+              placeholderLeft={"Start date"}
+              placeholderRight={"End date"}
+              onChangeLeft={inputLeftChangeHandler}
+              onChangeRight={inputRightChangeHandler}
+              onClickArrowDown={onClickArrowButton}
+              onClickCalendar={onClickCalendarButton}
+              onFocusLeft={onFocusLeft}
+              onFocusRight={onFocusRight}
+              onClickLeft={onFocusLeft}
+              onClickRight={onFocusRight}
+              inputRefLeft={startDateInputRef}
+              inputRefRight={endDateInputRef}
+              variant={startDateIsAfterEnd ? "error" : variant}
+              widthLeft={widthLeft}
+              widthRight={widthRight}
+              minLeft={minDate}
+              maxLeft={maxDate}
+              minRight={minDate}
+              maxRight={maxDate}
             />
-          )
-        }
+          </Box>
+        )}
+        placement={defaultPopoverPlacement}
+        onRequestClose={hideCalendar}
+        open={isCalendarVisible}
       >
-        <DualTextInput
-          autoFocusLeft={autoFocus}
-          onEsc={onEsc}
-          onEnter={onEnter}
-          onBlur={onBlur}
-          disabled={disabled}
-          separatorIcon={stenaArrowRight}
-          typeLeft={"date"}
-          typeRight={"date"}
-          placeholderLeft={"Start date"}
-          placeholderRight={"End date"}
-          onChangeLeft={inputLeftChangeHandler}
-          onChangeRight={inputRightChangeHandler}
-          onClickArrowDown={onClickArrowButton}
-          onClickCalendar={onClickCalendarButton}
-          onFocusLeft={onFocusLeft}
-          onFocusRight={onFocusRight}
-          onClickLeft={onFocusLeft}
-          onClickRight={onFocusRight}
-          inputRefLeft={startDateInputRef}
-          inputRefRight={endDateInputRef}
-          variant={startDateIsAfterEnd ? "error" : variant}
-          widthLeft={widthLeft}
-          widthRight={widthRight}
-          minLeft={minDate}
-          maxLeft={maxDate}
-          minRight={minDate}
-          maxRight={maxDate}
+        <CalendarWithMonthSwitcher
+          onClickDay={onClickDay}
+          dateInFocus={dateInFocus}
+          setDateInFocus={setDateInFocus}
+          currentPanel={currentPanel}
+          setCurrentPanel={setCurrentPanel}
+          minDate={minDate}
+          maxDate={maxDate}
+          {...calendarProps}
+          statePerMonth={statePerMonth}
         />
-      </Popover>
+      </ControlledPopover>
     </Box>
   );
 }