@axinom/mosaic-ui 0.67.0-rc.0 → 0.67.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axinom/mosaic-ui",
-  "version": "0.67.0-rc.0",
+  "version": "0.67.0-rc.2",
   "description": "UI components for building Axinom Mosaic applications",
   "author": "Axinom",
   "license": "PROPRIETARY",
@@ -112,5 +112,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "70d5670035f6c7b78dcea00a0b5e082bef45afe3"
+  "gitHead": "2364d1ad780b65c4974987c3f3ac30e09dfe850e"
 }

package/src/components/Filters/Filter/Filter.scss

@@ -109,7 +109,7 @@ $input-inactive: 1px solid var(--input-border-color, $input-border-color);
   }
 }
 
-.content {
+.contentContainer {
   display: grid;
   grid-template-rows: 0fr;
   transition: grid-template-rows 200ms cubic-bezier(0.4, 0, 0.2, 1);
@@ -118,6 +118,12 @@ $input-inactive: 1px solid var(--input-border-color, $input-border-color);
     grid-template-rows: 1fr;
   }
 
+  .content {
+    border-left: 1px solid transparent;
+    border-right: 1px solid transparent;
+    border-bottom: 1px solid transparent;
+  }
+
   .active {
     display: grid;
     overflow: hidden;

package/src/components/Filters/Filter/Filter.tsx

@@ -274,7 +274,9 @@ export const Filter = <T extends Data>({
         />
       </div>
       <div
-        className={clsx(classes.content, { [classes.expanded]: isExpanded })}
+        className={clsx(classes.contentContainer, {
+          [classes.expanded]: isExpanded,
+        })}
       >
         {hasValue && !isExpanded && (
           <div
@@ -299,7 +301,7 @@ export const Filter = <T extends Data>({
         {isExpanded && (
           <div
             data-test-id="filter-content"
-            className={clsx({ [classes.active]: isActive })}
+            className={clsx({ [classes.active]: isActive }, classes.content)}
           >
             {renderFilterContent()}
           </div>

package/src/components/Filters/SelectionTypes/DateTimeFilter/DateTimeFilter.scss

@@ -4,13 +4,24 @@
 .container {
   display: grid;
 
+  .dateTimeInputWrapper {
+    border: $input-inactive;
+
+    &:focus-within {
+      border: $input-active;
+    }
+  }
   .dateTimeInput {
     display: grid;
     grid-template-rows: 1fr;
     grid-template-columns: 1fr min-content;
 
     place-items: center;
-    border: $input-inactive;
+    border: 2px solid transparent;
+
+    &:focus-within {
+      border: none;
+    }
 
     .inputValue {
       &:focus {
@@ -40,10 +51,6 @@
       }
     }
 
-    &:focus-within {
-      border: $input-active;
-    }
-
     &.hasError {
       border: 3px solid
         var(--input-invalid-border-color, $input-invalid-border-color);

package/src/components/Filters/SelectionTypes/DateTimeFilter/DateTimeFilter.tsx

@@ -106,32 +106,34 @@ export const DateTimeFilter: React.FC<DateTimeFilterProps> = ({
           className,
         )}
       >
-        <div
-          className={clsx(
-            classes.dateTimeInput,
-            'datetime-border-wrapper',
-            errorMsg && classes.hasError,
-          )}
-          ref={container}
-        >
-          <input
-            id={inputId}
-            autoFocus
-            className={clsx(classes.inputValue)}
-            onKeyDown={handleKeyDown}
-            onChange={(e) => setValue(e.target.value)}
-            value={value}
-          />
-          <Button
-            className={clsx(classes.button)}
-            buttonContext={ButtonContext.None}
-            icon={IconName.Calendar}
-            onButtonClicked={(e) => {
-              e.persist();
-              e.preventDefault();
-              setShowPicker(!showPicker);
-            }}
-          />
+        <div className={clsx(classes.dateTimeInputWrapper)}>
+          <div
+            className={clsx(
+              classes.dateTimeInput,
+              'datetime-border-wrapper',
+              errorMsg && classes.hasError,
+            )}
+            ref={container}
+          >
+            <input
+              id={inputId}
+              autoFocus
+              className={clsx(classes.inputValue)}
+              onKeyDown={handleKeyDown}
+              onChange={(e) => setValue(e.target.value)}
+              value={value}
+            />
+            <Button
+              className={clsx(classes.button)}
+              buttonContext={ButtonContext.None}
+              icon={IconName.Calendar}
+              onButtonClicked={(e) => {
+                e.persist();
+                e.preventDefault();
+                setShowPicker(!showPicker);
+              }}
+            />
+          </div>
         </div>
         {errorMsg !== undefined && <small>{errorMsg}</small>}
       </div>

package/src/components/Filters/SelectionTypes/OptionsFilter/OptionsFilter.scss

@@ -5,7 +5,6 @@
 
   display: grid;
   grid-auto-rows: 40px;
-  gap: 1px;
   border-top: unset;
 
   .option {

package/src/components/FormElements/DateTimeField/DateTimeText.scss

@@ -43,16 +43,15 @@
     display: grid;
     grid-template-columns: min-content min-content;
   }
+}
 
-  .picker {
-    position: absolute;
-    overflow: visible;
-    z-index: 99999;
-  }
+.picker {
+  overflow: visible;
+  z-index: 99999;
 }
 
 .backdrop {
-  position: absolute;
+  position: fixed;
   top: 0;
   left: 0;
   bottom: 0;

package/src/components/FormElements/DateTimeField/DateTimeText.tsx

@@ -1,6 +1,8 @@
 import clsx from 'clsx';
 import { DateTime } from 'luxon';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { createPortal } from 'react-dom';
+import { usePopper } from 'react-popper';
 import { noop } from '../../../helpers/utils';
 import { Button, ButtonContext } from '../../Buttons';
 import { DateTimePicker } from '../../DateTime/DateTimePicker';
@@ -46,6 +48,9 @@ export const DateTimeText: React.FC<DateTimeTextProps> = ({
   ...rest
 }) => {
   const container = useRef<HTMLDivElement>(null);
+  const [pickerElement, setPickerElement] = useState<HTMLDivElement | null>(
+    null,
+  );
   const errorMsg: string | undefined = error;
   const [display, setDisplay] = useState<string>(() => {
     const locale = fromISODate(value, modifyTime);
@@ -54,6 +59,30 @@ export const DateTimeText: React.FC<DateTimeTextProps> = ({
 
   const [showPicker, setShowPicker] = useState(false);
 
+  const { styles, attributes } = usePopper(container.current, pickerElement, {
+    placement: 'bottom-start',
+    modifiers: [
+      {
+        name: 'flip',
+        options: {
+          fallbackPlacements: ['top-start', 'bottom-start'],
+        },
+      },
+      {
+        name: 'preventOverflow',
+        options: {
+          padding: 8,
+        },
+      },
+      {
+        name: 'offset',
+        options: {
+          offset: [0, 4],
+        },
+      },
+    ],
+  });
+
   useEffect(() => {
     const locale = fromISODate(value, modifyTime);
     setDisplay(locale ?? '');
@@ -119,31 +148,36 @@ export const DateTimeText: React.FC<DateTimeTextProps> = ({
           }}
         />
       </div>
-      {showPicker && (
-        <>
-          <div
-            className={clsx(classes.picker)}
-            style={calculatePosition(container.current)}
-          >
-            <DateTimePicker
-              value={getValue(value)}
-              onSelected={(value) => {
-                if (!modifyTime) {
-                  setShowPicker(false);
-                }
-                onChange && onChange(DateTime.fromJSDate(value).toISO(), true);
+      {showPicker &&
+        createPortal(
+          <>
+            <div
+              ref={setPickerElement}
+              className={clsx(classes.picker)}
+              style={styles.popper}
+              {...attributes.popper}
+            >
+              <DateTimePicker
+                value={getValue(value)}
+                onSelected={(value) => {
+                  if (!modifyTime) {
+                    setShowPicker(false);
+                  }
+                  onChange &&
+                    onChange(DateTime.fromJSDate(value).toISO(), true);
+                }}
+                showTimePicker={modifyTime}
+              />
+            </div>
+            <div
+              className={clsx(classes.backdrop)}
+              onClick={() => {
+                setShowPicker(false);
               }}
-              showTimePicker={modifyTime}
-            />
-          </div>
-          <div
-            className={clsx(classes.backdrop)}
-            onClick={() => {
-              setShowPicker(false);
-            }}
-          ></div>
-        </>
-      )}
+            ></div>
+          </>,
+          document.body,
+        )}
     </FormElementContainer>
   );
 };
@@ -172,22 +206,3 @@ function fromISODate(ISODateString: string, modifyTime: boolean): string {
     return ISODateString;
   }
 }
-
-const calculatePosition = (
-  container: HTMLDivElement | null,
-): React.CSSProperties => {
-  if (!container) {
-    return {};
-  }
-
-  const PICKER_HEIGHT = 280;
-
-  const rect = container.getBoundingClientRect();
-  const top = rect.bottom;
-
-  if (top + PICKER_HEIGHT > window.innerHeight) {
-    return { top: rect.top - PICKER_HEIGHT, left: container.offsetLeft };
-  } else {
-    return { top, left: container.offsetLeft };
-  }
-};