fix: resolve merge conflicts

atls · Sep 6, 2023 · 9308b04 · 9308b04
2 parents c09b9e4 + 6ef6b0e
commit 9308b04
Show file tree

Hide file tree

Showing 129 changed files with 494 additions and 428 deletions.
diff --git a/.yarn/versions/10e8fc60.yml b/.yarn/versions/10e8fc60.yml
@@ -0,0 +1,7 @@
+releases:
+  "@atls-ui-admin/button": patch
+  "@atls-ui-admin/icon": patch
+  "@atls-ui-admin/icons": patch
+  "@atls-ui-admin/upload": patch
+  "@atls-utils/use-hover": patch
+  "@atls-utils/use-popover": patch
diff --git a/.yarn/versions/35d80800.yml b/.yarn/versions/35d80800.yml
@@ -0,0 +1,57 @@
+releases:
+  "@atls-ui-admin/button": patch
+  "@atls-ui-admin/icon": patch
+  "@atls-ui-admin/icons": patch
+  "@atls-ui-admin/upload": patch
+  "@atls-ui-generators/button": patch
+  "@atls-ui-generators/icons": patch
+  "@atls-ui-generators/input": patch
+  "@atls-ui-parts/autocomplete": patch
+  "@atls-ui-parts/avatar": patch
+  "@atls-ui-parts/button": patch
+  "@atls-ui-parts/card": patch
+  "@atls-ui-parts/carousel": patch
+  "@atls-ui-parts/checkbox": patch
+  "@atls-ui-parts/condition": patch
+  "@atls-ui-parts/conditional-render": patch
+  "@atls-ui-parts/core": patch
+  "@atls-ui-parts/datepicker": patch
+  "@atls-ui-parts/dom": patch
+  "@atls-ui-parts/image": patch
+  "@atls-ui-parts/input": patch
+  "@atls-ui-parts/layout": patch
+  "@atls-ui-parts/link": patch
+  "@atls-ui-parts/progress": patch
+  "@atls-ui-parts/scalable-content": patch
+  "@atls-ui-parts/select": patch
+  "@atls-ui-parts/sidebar": patch
+  "@atls-ui-parts/styles": patch
+  "@atls-ui-parts/swiper": patch
+  "@atls-ui-parts/switch": patch
+  "@atls-ui-parts/text": patch
+  "@atls-ui-parts/tooltip": patch
+  "@atls-ui-parts/upload": patch
+  "@atls-ui-proto/autocomplete": patch
+  "@atls-ui-proto/avatar": patch
+  "@atls-ui-proto/button": patch
+  "@atls-ui-proto/carousel": patch
+  "@atls-ui-proto/checkbox": patch
+  "@atls-ui-proto/core": patch
+  "@atls-ui-proto/datepicker": patch
+  "@atls-ui-proto/divider": patch
+  "@atls-ui-proto/image": patch
+  "@atls-ui-proto/input": patch
+  "@atls-ui-proto/layout": patch
+  "@atls-ui-proto/link": patch
+  "@atls-ui-proto/modal": patch
+  "@atls-ui-proto/parallax": patch
+  "@atls-ui-proto/placeholder": patch
+  "@atls-ui-proto/popover": patch
+  "@atls-ui-proto/progress": patch
+  "@atls-ui-proto/select": patch
+  "@atls-ui-proto/swiper": patch
+  "@atls-ui-proto/switch": patch
+  "@atls-ui-proto/text": patch
+  "@atls-ui-proto/theme": patch
+  "@atls-ui-proto/tooltip": patch
+  "@atls-ui-proto/upload": patch
diff --git a/generators/button/package.json b/generators/button/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atls-ui-generators/button",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "license": "BSD-3-Clause",
   "main": "src/index.ts",
   "bin": {
@@ -15,7 +15,7 @@
     "postpack": "rm -rf dist"
   },
   "dependencies": {
-    "@atls-ui-generators/utils": "workspace:0.0.5",
+    "@atls-ui-generators/utils": "workspace:*",
     "@atls/config-prettier": "^0.0.5",
     "@atls/prettier-plugin": "^0.0.7",
     "@babel/standalone": "^7.19.5",
@@ -24,7 +24,7 @@
     "prettier": "^2.5.1"
   },
   "devDependencies": {
-    "@atls-ui-parts/button": "workspace:0.0.12",
+    "@atls-ui-parts/button": "workspace:*",
     "@types/babel__standalone": "^7",
     "@types/prettier": "^2",
     "styled-tools": "^1.7.2"

diff --git a/generators/icons/package.json b/generators/icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atls-ui-generators/icons",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "license": "BSD-3-Clause",
   "main": "src/index.ts",
   "bin": {
@@ -15,7 +15,7 @@
     "postpack": "rm -rf dist"
   },
   "dependencies": {
-    "@atls-ui-generators/utils": "workspace:0.0.5",
+    "@atls-ui-generators/utils": "workspace:*",
     "@atls/config-prettier": "^0.0.5",
     "@atls/prettier-plugin": "^0.0.7",
     "@babel/standalone": "^7.19.5",
@@ -27,7 +27,7 @@
     "prettier": "^2.5.1"
   },
   "devDependencies": {
-    "@atls-ui-parts/button": "workspace:0.0.12",
+    "@atls-ui-parts/button": "workspace:*",
     "@types/babel__standalone": "^7",
     "@types/fs-extra-promise": "^1",
     "@types/prettier": "^2",

diff --git a/generators/input/package.json b/generators/input/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atls-ui-generators/input",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "license": "BSD-3-Clause",
   "main": "src/index.ts",
   "bin": {
@@ -15,7 +15,7 @@
     "postpack": "rm -rf dist"
   },
   "dependencies": {
-    "@atls-ui-generators/utils": "workspace:0.0.5",
+    "@atls-ui-generators/utils": "workspace:*",
     "@atls/config-prettier": "^0.0.5",
     "@atls/prettier-plugin": "^0.0.7",
     "@babel/standalone": "^7.19.5",
@@ -24,7 +24,7 @@
     "prettier": "^2.5.1"
   },
   "devDependencies": {
-    "@atls-ui-parts/input": "workspace:0.0.13",
+    "@atls-ui-parts/input": "workspace:*",
     "@types/babel__standalone": "^7",
     "@types/prettier": "^2",
     "styled-tools": "^1.7.2"

diff --git a/ui-admin/button/package.json b/ui-admin/button/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atls-ui-admin/button",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "license": "BSD-3-Clause",
   "files": [
     "dist"
@@ -11,7 +11,7 @@
     "postpack": "rm -rf dist"
   },
   "dependencies": {
-    "@atls-ui-parts/button": "workspace:0.0.12"
+    "@atls-ui-parts/button": "workspace:*"
   },
   "devDependencies": {
     "@emotion/styled": "^11.9.3",

diff --git a/ui-admin/design/package.json b/ui-admin/design/package.json
@@ -14,8 +14,8 @@
     "express": "^4.18.1"
   },
   "devDependencies": {
-    "@atls-ui-admin/button": "workspace:0.0.12",
-    "@atls-ui-admin/theme": "workspace:0.0.7",
+    "@atls-ui-admin/button": "workspace:*",
+    "@atls-ui-admin/theme": "workspace:*",
     "@babel/core": "^7.18.5",
     "@emotion/babel-plugin": "^11.9.2",
     "@emotion/css": "^11.9.0",

diff --git a/ui-admin/icon/package.json b/ui-admin/icon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atls-ui-admin/icon",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "license": "BSD-3-Clause",
   "main": "src/index.ts",
   "files": [

diff --git a/ui-admin/icons/package.json b/ui-admin/icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atls-ui-admin/icons",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "license": "BSD-3-Clause",
   "main": "src/index.ts",
   "files": [
@@ -15,7 +15,7 @@
   "devDependencies": {
     "@atlantis-lab/prettier-config": "^0.1.12",
     "@atlantis-lab/tsconfig": "^0.1.12",
-    "@atls-ui-admin/icon": "workspace:0.0.8",
+    "@atls-ui-admin/icon": "workspace:*",
     "@svgr/core": "5.4.0",
     "@testing-library/react": "^13.3.0",
     "@types/prettier": "^2",

diff --git a/ui-admin/upload/package.json b/ui-admin/upload/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atls-ui-admin/upload",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "license": "MIT",
   "main": "src/index.ts",
   "files": [
@@ -17,8 +17,8 @@
   },
   "devDependencies": {
     "@apollo/client": "3.6.6",
-    "@atls-ui-admin/icon": "workspace:0.0.8",
-    "@atls-ui-admin/icons": "workspace:0.0.8",
+    "@atls-ui-admin/icon": "workspace:*",
+    "@atls-ui-admin/icons": "workspace:*",
     "@emotion/react": "^11.9.3",
     "@emotion/styled": "^11.9.3",
     "@testing-library/react": "^13.3.0",

diff --git a/ui-parts/autocomplete/package.json b/ui-parts/autocomplete/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atls-ui-parts/autocomplete",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "license": "BSD-3-Clause",
   "main": "src/index.ts",
   "files": [
@@ -12,7 +12,7 @@
     "postpack": "rm -rf dist"
   },
   "dependencies": {
-    "@atls-ui-proto/input": "workspace:0.0.13",
+    "@atls-ui-proto/input": "workspace:*",
     "downshift": "7.6.2",
     "react-laag": "2.0.5"
   },

diff --git a/ui-parts/autocomplete/src/autocomplete.component.tsx b/ui-parts/autocomplete/src/autocomplete.component.tsx
@@ -57,9 +57,9 @@ const Autocomplete = (
 
   const { layerProps, renderLayer, triggerProps, triggerBounds } = useLayer({
     isOpen,
-    placement: 'bottom-start',
     auto: true,
     triggerOffset: 0,
+    placement: 'bottom-start',
     possiblePlacements: ['bottom-start', 'top-start'] as Array<Placement>,
   })
 
@@ -87,8 +87,8 @@ const Autocomplete = (
   )
 
   const { onChange: downshiftOnChange, ...restProps } = getInputProps(triggerProps)
-  const inputProps = { ...restProps, onChangeNative: downshiftOnChange }
   const menuProps = getMenuProps({ style: {} })
+  const inputProps = { ...restProps, onChangeNative: downshiftOnChange }
 
   return (
     <>

diff --git a/ui-parts/autocomplete/src/autocomplete.stories.tsx b/ui-parts/autocomplete/src/autocomplete.stories.tsx
@@ -24,7 +24,7 @@ export const WithValue = () => {
   const [value, setValue] = useState({ value: 'Neptunium' })
 
   return (
-    <div style={{ width: '100%', minHeight: 400, paddingTop: 40 }}>
+    <div style={{ minHeight: 400, width: '100%', paddingTop: 40 }}>
       <Autocomplete value={value} options={options} onChange={setValue} />
     </div>
   )

diff --git a/ui-parts/avatar/package.json b/ui-parts/avatar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atls-ui-parts/avatar",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "license": "BSD-3-Clause",
   "main": "src/index.ts",
   "files": [
@@ -12,13 +12,13 @@
     "postpack": "rm -rf dist"
   },
   "dependencies": {
-    "@atls-ui-parts/styles": "workspace:0.0.4"
+    "@atls-ui-parts/styles": "workspace:*"
   },
   "devDependencies": {
-    "@atls-ui-parts/image": "workspace:0.0.4",
-    "@atls-ui-parts/scalable-content": "workspace:0.0.4",
-    "@atls-ui-parts/text-transform": "workspace:0.0.3",
-    "@atls/storybook-google-fonts": "workspace:0.0.0",
+    "@atls-ui-parts/image": "workspace:*",
+    "@atls-ui-parts/scalable-content": "workspace:*",
+    "@atls-ui-parts/text-transform": "workspace:*",
+    "@atls/storybook-google-fonts": "workspace:*",
     "@emotion/styled": "11.9.3",
     "@types/jest": "29.5.4",
     "@types/node": "20.5.7",
@@ -31,7 +31,7 @@
   },
   "peerDependencies": {
     "@emotion/styled": "11.9.3",
-    "react": "*",
+    "react": "18.2.0",
     "styled-system": "5.1.5",
     "styled-tools": "1.7.2"
   },

diff --git a/ui-parts/avatar/src/avatar.stories.tsx b/ui-parts/avatar/src/avatar.stories.tsx
@@ -26,8 +26,8 @@ export default {
 
 export const Avatar = ({
   backgroundColor,
-  borderColor,
   borderWidth,
+  borderColor,
   size,
   borderRadius,
   padding,

diff --git a/ui-parts/avatar/src/avatar.templates.ts b/ui-parts/avatar/src/avatar.templates.ts
@@ -40,8 +40,8 @@ ${buildProps({
 
 const appearancePrimaryStyles = createAppearanceStyles({
 ${buildProps({
-  backgroundColor,
   borderColor,
+  backgroundColor,
 })}
 })
 

diff --git a/ui-parts/avatar/src/shape/shape.interfaces.ts b/ui-parts/avatar/src/shape/shape.interfaces.ts
@@ -4,8 +4,8 @@ export interface AvatarShapeStyles {
   size: number
   borderRadius?: number | Function
   borderWidth?: number | Function
-  padding?: number | Function
   fontFamily?: string | Function
+  padding?: number | Function
   fontSize?: number | Function
   fontWeight?: string | number | Function
 }

diff --git a/ui-parts/button/package.json b/ui-parts/button/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atls-ui-parts/button",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "license": "BSD-3-Clause",
   "main": "src/index.ts",
   "files": [
@@ -12,21 +12,21 @@
     "postpack": "rm -rf dist"
   },
   "dependencies": {
-    "@atls-ui-parts/styles": "workspace:0.0.4"
+    "@atls-ui-parts/styles": "workspace:*"
   },
   "devDependencies": {
-    "@atls/storybook-google-fonts": "workspace:0.0.0",
-    "@emotion/styled": "^11.9.3",
-    "@mdx-js/react": "^2.3.0",
-    "@storybook/addon-docs": "^6.5.9",
-    "@storybook/components": "^6.5.9",
-    "@types/jest": "^28.1.2",
-    "@types/mdx-js__react": "^1.5.5",
-    "@types/react": "^18.0.14",
-    "@types/styled-system": "^5.1.15",
-    "react": "^18.2.0",
-    "styled-system": "^5.1.5",
-    "styled-tools": "^1.7.2"
+    "@atls/storybook-google-fonts": "workspace:*",
+    "@emotion/styled": "11.9.3",
+    "@mdx-js/react": "2.3.0",
+    "@storybook/addon-docs": "6.5.9",
+    "@storybook/components": "6.5.9",
+    "@types/jest": "28.1.2",
+    "@types/mdx-js__react": "1.5.5",
+    "@types/react": "18.0.14",
+    "@types/styled-system": "5.1.15",
+    "react": "18.2.0",
+    "styled-system": "5.1.5",
+    "styled-tools": "1.7.2"
   },
   "peerDependencies": {
     "@emotion/styled": "11.9.3",

diff --git a/ui-parts/button/src/appearance/appearance.styles.ts b/ui-parts/button/src/appearance/appearance.styles.ts
@@ -7,8 +7,8 @@ import { combine }                from '@atls-ui-parts/styles'
 import { ButtonAppearanceStyles } from './appearance.interfaces'
 
 export const createColorStyles: styleFn = (
-    color: string,
     backgroundColor: string,
+    color: string,
     borderColor: string
   ) =>
   () => ({

diff --git a/ui-parts/button/src/button.stories.tsx b/ui-parts/button/src/button.stories.tsx
@@ -34,8 +34,8 @@ export const Button = ({
   size,
   fontFamily,
   fontSize,
-  fontWeight,
   shapeRounding,
+  fontWeight,
   paddingLeft,
   paddingRight,
   contentDivider,