fix: conflicts

razorpay · Jul 21, 2023 · 55cbf02 · 55cbf02
2 parents 25ef73f + db4e7e4
commit 55cbf02
Show file tree

Hide file tree

Showing 81 changed files with 1,817 additions and 243 deletions.
diff --git a/.changeset/orange-tables-give.md b/.changeset/orange-tables-give.md
diff --git a/packages/blade-coverage-extension/yarn.lock b/packages/blade-coverage-extension/yarn.lock
@@ -9011,9 +9011,9 @@ which@^2.0.1:
     isexe "^2.0.0"
 
 word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 workbox-background-sync@6.6.1:
   version "6.6.1"

diff --git a/packages/blade/.storybook/react-native/storybook.requires.js b/packages/blade/.storybook/react-native/storybook.requires.js
@@ -55,6 +55,7 @@ const getStories = () => {
     require('../../src/components/Modal/docs/SimpleModal.stories.tsx'),
     require('../../src/components/ProgressBar/ProgressBar.stories.tsx'),
     require('../../src/components/Radio/Radio.stories.tsx'),
+    require('../../src/components/Skeleton/Skeleton.stories.tsx'),
     require('../../src/components/SkipNav/SkipNav.stories.tsx'),
     require('../../src/components/Spinner/BaseSpinner/BaseSpinner.stories.tsx'),
     require('../../src/components/Spinner/Spinner/Spinner.stories.tsx'),

diff --git a/packages/blade/CHANGELOG.md b/packages/blade/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @razorpay/blade
 
+## 9.1.2
+
+### Patch Changes
+
+- 6763f5fa: fix(List): re-export ListItemText
+
+## 9.1.1
+
+### Patch Changes
+
+- fe31363e: fix(Input): correct helpText and input box alignment
+- e7317212: fix: add border-style when border width or color is set
+
+## 9.1.0
+
+### Minor Changes
+
+- b1a1faef: feat(blade): added Skeleton Component
+
+### Patch Changes
+
+- 199d6f0e: fix(Card): fix spacing between header & leading on react native
+- dd234a65: feat: add support for ListItemText within List
+
 ## 9.0.3
 
 ### Patch Changes

diff --git a/packages/blade/package.json b/packages/blade/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@razorpay/blade",
   "description": "The Design System that powers Razorpay",
-  "version": "9.0.3",
+  "version": "9.1.2",
   "license": "MIT",
   "engines": {
     "node": ">=18.12.1"

diff --git a/...ges/blade/src/components/Accordion/__tests__/__snapshots__/Accordion.native.test.tsx.snap b/...ges/blade/src/components/Accordion/__tests__/__snapshots__/Accordion.native.test.tsx.snap
@@ -412,10 +412,12 @@ exports[`<Accordion /> should render 1`] = `
           Array [
             Object {
               "borderBottomColor": "hsla(216, 15%, 54%, 0.18)",
-              "borderBottomStyle": "solid",
-              "borderBottomWidth": 1,
               "borderStyle": "solid",
               "borderWidth": 0,
+            },
+            Object {
+              "borderBottomStyle": "solid",
+              "borderBottomWidth": 1,
               "flexGrow": 1,
             },
           ]
@@ -802,10 +804,12 @@ exports[`<Accordion /> should render 1`] = `
           Array [
             Object {
               "borderBottomColor": "hsla(216, 15%, 54%, 0.18)",
-              "borderBottomStyle": "solid",
-              "borderBottomWidth": 1,
               "borderStyle": "solid",
               "borderWidth": 0,
+            },
+            Object {
+              "borderBottomStyle": "solid",
+              "borderBottomWidth": 1,
               "flexGrow": 1,
             },
           ]
@@ -1192,10 +1196,12 @@ exports[`<Accordion /> should render 1`] = `
           Array [
             Object {
               "borderBottomColor": "hsla(216, 15%, 54%, 0.18)",
-              "borderBottomStyle": "solid",
-              "borderBottomWidth": 1,
               "borderStyle": "solid",
               "borderWidth": 0,
+            },
+            Object {
+              "borderBottomStyle": "solid",
+              "borderBottomWidth": 1,
               "flexGrow": 1,
             },
           ]

diff --git a/packages/blade/src/components/Alert/__tests__/__snapshots__/Alert.native.test.tsx.snap b/packages/blade/src/components/Alert/__tests__/__snapshots__/Alert.native.test.tsx.snap
@@ -17,6 +17,9 @@ exports[`<Alert /> should render 1`] = `
     isFullWidth={false}
     style={
       Array [
+        Object {
+          "textAlign": "left",
+        },
         Object {
           "alignItems": "flex-start",
           "backgroundColor": "hsla(216, 15%, 54%, 0.09)",
@@ -32,7 +35,6 @@ exports[`<Alert /> should render 1`] = `
           "paddingLeft": 8,
           "paddingRight": 8,
           "paddingTop": 8,
-          "textAlign": "left",
         },
       ]
     }
@@ -289,6 +291,9 @@ exports[`<Alert /> should render positive intent and full width 1`] = `
     isFullWidth={true}
     style={
       Array [
+        Object {
+          "textAlign": "left",
+        },
         Object {
           "alignItems": "flex-start",
           "backgroundColor": "hsla(155, 100%, 31%, 0.09)",
@@ -304,7 +309,6 @@ exports[`<Alert /> should render positive intent and full width 1`] = `
           "paddingLeft": 16,
           "paddingRight": 16,
           "paddingTop": 12,
-          "textAlign": "left",
           "width": "100%",
         },
       ]