Merge pull request #1065 from strapi/release/1.7.7

Author: joshuaellis

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*", "docs"],
-  "version": "1.7.6",
+  "version": "1.7.7",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

packages/primitives/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/ui-primitives",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,

packages/primitives/src/helpers/events.ts

@@ -0,0 +1 @@
+export { composeEventHandlers } from '@radix-ui/primitive';

packages/primitives/src/index.ts

@@ -4,6 +4,11 @@
 export * from './components/Combobox';
 export * from './components/Select';
 
+/* -------------------------------------------------------------------------------------------------
+ * Helpers
+ * -----------------------------------------------------------------------------------------------*/
+export * from './helpers/events';
+
 /* -------------------------------------------------------------------------------------------------
  * Hooks
  * -----------------------------------------------------------------------------------------------*/

packages/strapi-design-system/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/design-system",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -24,7 +24,7 @@
     "@radix-ui/react-dismissable-layer": "^1.0.3",
     "@radix-ui/react-dropdown-menu": "^2.0.4",
     "@radix-ui/react-focus-scope": "1.0.2",
-    "@strapi/ui-primitives": "^1.7.6",
+    "@strapi/ui-primitives": "^1.7.7",
     "@uiw/react-codemirror": "^4.19.16",
     "aria-hidden": "^1.2.3",
     "compute-scroll-into-view": "^3.0.3",
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@playwright/test": "1.33.0",
-    "@strapi/icons": "^1.7.6",
+    "@strapi/icons": "^1.7.7",
     "@types/react-router-dom": "^5.3.3",
     "@types/styled-components": "^5.1.26",
     "axe-playwright": "^1.2.3",

packages/strapi-design-system/src/BaseButton/BaseButton.tsx

@@ -1,4 +1,4 @@
-import React, { ButtonHTMLAttributes } from 'react';
+import * as React from 'react';
 
 import styled from 'styled-components';
 
@@ -23,10 +23,7 @@ export const BaseButtonWrapper = styled(Flex)`
   ${buttonFocusStyle}
 `;
 
-export interface BaseButtonProps<TElement extends HTMLElement = HTMLButtonElement> extends FlexProps<TElement> {
-  disabled?: boolean;
-  type?: ButtonHTMLAttributes<HTMLButtonElement>['type'];
-}
+export type BaseButtonProps<TElement extends keyof JSX.IntrinsicElements = 'button'> = FlexProps<TElement>;
 
 export const BaseButton = React.forwardRef<HTMLButtonElement, BaseButtonProps>(
   ({ disabled, children, background = 'neutral0', ...props }, ref) => {

packages/strapi-design-system/src/BaseLink/BaseLink.tsx

@@ -2,13 +2,10 @@ import React from 'react';
 
 import { Box, BoxProps } from '../Box';
 
-export interface BaseLinkProps extends BoxProps<HTMLAnchorElement> {
+export type BaseLinkProps = BoxProps<'a'> & {
   disabled?: boolean;
-  href?: string;
   isExternal?: boolean;
-  rel?: string;
-  target?: string;
-}
+};
 
 export const BaseLink = React.forwardRef<HTMLAnchorElement, BaseLinkProps>(
   ({ href, rel = 'noreferrer noopener', target = '_self', disabled = false, isExternal = false, ...props }, ref) => {

packages/strapi-design-system/src/Box/Box.tsx

@@ -11,22 +11,22 @@ type DefaultThemeOrCSSProp<T extends keyof DefaultTheme, K extends keyof CSSProp
   | keyof DefaultTheme[T]
   | CSSProperties[K];
 
-export type BoxProps<TElement extends HTMLElement = HTMLDivElement> = Pick<
-  CSSProperties,
-  | 'pointerEvents'
-  | 'display'
-  | 'position'
-  | 'zIndex'
-  | 'overflow'
-  | 'cursor'
-  | 'transition'
-  | 'transform'
-  | 'animation'
-  | 'textAlign'
-  | 'textTransform'
-  | 'lineHeight'
-> &
-  React.HTMLAttributes<TElement> & {
+export type BoxProps<TElement extends keyof JSX.IntrinsicElements = 'div'> = React.ComponentPropsWithoutRef<TElement> &
+  Pick<
+    CSSProperties,
+    | 'pointerEvents'
+    | 'display'
+    | 'position'
+    | 'zIndex'
+    | 'overflow'
+    | 'cursor'
+    | 'transition'
+    | 'transform'
+    | 'animation'
+    | 'textAlign'
+    | 'textTransform'
+    | 'lineHeight'
+  > & {
     /**
      * JavaScript hover handler
      */