@entur/layout 3.4.1-next.1 → 3.4.1

package/dist/beta/types/Flex/Flex.d.ts

@@ -61,7 +61,5 @@ export type FlexOwnProps = {
 };
 export type FlexProps<T extends React.ElementType = typeof defaultElement> = PolymorphicComponentProps<T, FlexOwnProps>;
 declare const defaultElement = "div";
-export declare const Flex: React.ForwardRefExoticComponent<Omit<FlexOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, keyof FlexOwnProps>, "ref"> & React.RefAttributes<Element>>;
+export declare const Flex: <E extends React.ElementType = "div">({ direction, wrap, align, justify, alignContent, gap, rowGap, columnGap, flex, grow, shrink, basis, width, height, minWidth, minHeight, maxWidth, maxHeight, as, className, children, style, ...rest }: FlexProps<E>) => JSX.Element;
 export {};

package/dist/beta/types/Grid/Grid.d.ts

@@ -42,7 +42,5 @@ export type GridOwnProps = {
 };
 export type GridProps<T extends React.ElementType = typeof defaultElement> = PolymorphicComponentProps<T, GridOwnProps>;
 declare const defaultElement = "div";
-export declare const Grid: React.ForwardRefExoticComponent<Omit<GridOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, keyof GridOwnProps>, "ref"> & React.RefAttributes<Element>>;
+export declare const Grid: <E extends React.ElementType = "div">({ templateColumns, templateRows, gap, rowGap, columnGap, autoFlow, align, justify, alignContent, height, as, className, children, style, ...rest }: GridProps<E>) => JSX.Element;
 export {};

package/dist/beta/types/Grid/GridItem.d.ts

@@ -24,7 +24,5 @@ export type GridItemOwnProps = {
 };
 export type GridItemProps<T extends React.ElementType = typeof defaultElement> = PolymorphicComponentProps<T, GridItemOwnProps>;
 declare const defaultElement = "div";
-export declare const GridItem: React.ForwardRefExoticComponent<Omit<GridItemOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, keyof GridItemOwnProps>, "ref"> & React.RefAttributes<Element>>;
+export declare const GridItem: <E extends React.ElementType = "div">({ colSpan, rowSpan, as, className, children, style, ...rest }: GridItemProps<E>) => JSX.Element;
 export {};

package/dist/beta/types/templates/Sidebar.d.ts

@@ -1,39 +1,15 @@
 import { default as React } from 'react';
-import { PolymorphicComponentProps } from '@entur/utils';
-type SidebarOwnProps = {
+export type SidebarProps = React.HTMLAttributes<HTMLElement> & {
     /** Toggle contrast styling for the sidebar */
     contrast?: boolean;
-    className?: string;
-    style?: React.CSSProperties;
-    children?: React.ReactNode;
 };
-type SidebarSectionOwnProps = {
-    className?: string;
-    style?: React.CSSProperties;
-    children?: React.ReactNode;
-};
-declare const defaultSidebarElement = "aside";
-declare const defaultSectionElement = "div";
-export type SidebarProps<T extends React.ElementType = typeof defaultSidebarElement> = PolymorphicComponentProps<T, SidebarOwnProps>;
-export type SidebarSectionProps<T extends React.ElementType = typeof defaultSectionElement> = PolymorphicComponentProps<T, SidebarSectionOwnProps>;
-declare const SidebarLogo: React.ForwardRefExoticComponent<Omit<SidebarSectionOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, "as" | keyof SidebarSectionOwnProps>, "ref"> & React.RefAttributes<Element>>;
-declare const SidebarUser: React.ForwardRefExoticComponent<Omit<SidebarSectionOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, "as" | keyof SidebarSectionOwnProps>, "ref"> & React.RefAttributes<Element>>;
-declare const SidebarData: React.ForwardRefExoticComponent<Omit<SidebarSectionOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, "as" | keyof SidebarSectionOwnProps>, "ref"> & React.RefAttributes<Element>>;
-declare const SidebarNavigation: React.ForwardRefExoticComponent<Omit<SidebarSectionOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, "as" | keyof SidebarSectionOwnProps>, "ref"> & React.RefAttributes<Element>>;
-declare const SidebarFooter: React.ForwardRefExoticComponent<Omit<SidebarSectionOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, "as" | keyof SidebarSectionOwnProps>, "ref"> & React.RefAttributes<Element>>;
-declare const SidebarRoot: React.ForwardRefExoticComponent<Omit<SidebarOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, "as" | keyof SidebarOwnProps>, "ref"> & React.RefAttributes<Element>>;
+export type SidebarSectionProps = React.HTMLAttributes<HTMLElement>;
+declare const SidebarLogo: React.FC<SidebarSectionProps>;
+declare const SidebarUser: React.FC<SidebarSectionProps>;
+declare const SidebarData: React.FC<SidebarSectionProps>;
+declare const SidebarNavigation: React.FC<SidebarSectionProps>;
+declare const SidebarFooter: React.FC<SidebarSectionProps>;
+declare const SidebarRoot: React.FC<SidebarProps>;
 export type SidebarComponent = typeof SidebarRoot & {
     Logo: typeof SidebarLogo;
     User: typeof SidebarUser;

package/dist/beta/types/templates/portal/Portal.d.ts

@@ -1,26 +1,9 @@
 import { default as React } from 'react';
-import { PolymorphicComponentProps } from '@entur/utils';
-import { Grid } from '../../Grid';
 import { SidebarComponent } from '../Sidebar';
-type PortalOwnProps = {
-    className?: string;
-    style?: React.CSSProperties;
-    children?: React.ReactNode;
-};
-type PortalMainOwnProps = {
-    className?: string;
-    style?: React.CSSProperties;
-    children?: React.ReactNode;
-};
-declare const defaultPortalMainElement = "main";
-export type PortalProps<T extends React.ElementType = typeof Grid> = PolymorphicComponentProps<T, PortalOwnProps>;
-export type PortalMainProps<T extends React.ElementType = typeof defaultPortalMainElement> = PolymorphicComponentProps<T, PortalMainOwnProps>;
-declare const PortalRoot: React.ForwardRefExoticComponent<Omit<PortalOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, "as" | keyof PortalOwnProps>, "ref"> & React.RefAttributes<Element>>;
-declare const PortalMain: React.ForwardRefExoticComponent<Omit<PortalMainOwnProps & {
-    as?: React.ElementType<any> | undefined;
-} & Omit<Omit<any, "ref">, "as" | keyof PortalMainOwnProps>, "ref"> & React.RefAttributes<Element>>;
+export type PortalProps = React.HTMLAttributes<HTMLDivElement>;
+export type PortalMainProps = React.HTMLAttributes<HTMLElement>;
+declare const PortalRoot: React.FC<PortalProps>;
+declare const PortalMain: React.FC<PortalMainProps>;
 export type PortalComponent = typeof PortalRoot & {
     Sidebar: SidebarComponent;
     Main: typeof PortalMain;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@entur/layout",
-  "version": "3.4.1-next.1",
+  "version": "3.4.1",
   "license": "EUPL-1.2",
   "main": "dist/layout.cjs.js",
   "module": "dist/layout.esm.js",
@@ -51,9 +51,9 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@entur/icons": "^8.4.2",
-    "@entur/tokens": "^3.22.1",
-    "@entur/typography": "^2.1.3",
+    "@entur/icons": "^8.4.3",
+    "@entur/tokens": "^3.22.2",
+    "@entur/typography": "^2.1.4",
     "@entur/utils": "^0.13.1",
     "classnames": "^2.5.1"
   },
@@ -70,5 +70,5 @@
     "vite": "^7.1.3",
     "vite-plugin-dts": "^4.5.4"
   },
-  "gitHead": "9a27d33d8c6c529e6a9bf94101cb3ef76470dc45"
+  "gitHead": "20bfbc9666763680b8871a62f9503b0dfd481531"
 }