Merge branch 'master' into fix/max-height-type

contentful · May 7, 2020 · 518235a · 518235a
2 parents a2380fd + 0de5633
commit 518235a
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 10 deletions.
diff --git a/packages/components/forma-36-react-datepicker/CHANGELOG.md b/packages/components/forma-36-react-datepicker/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.1-alpha.79](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-datepicker@0.1.1-alpha.78...@contentful/forma-36-react-datepicker@0.1.1-alpha.79) (2020-05-05)
+
+**Note:** Version bump only for package @contentful/forma-36-react-datepicker
+
+
+
+
+
 ## [0.1.1-alpha.78](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-datepicker@0.1.1-alpha.77...@contentful/forma-36-react-datepicker@0.1.1-alpha.78) (2020-04-24)
 
 **Note:** Version bump only for package @contentful/forma-36-react-datepicker

diff --git a/packages/components/forma-36-react-datepicker/package.json b/packages/components/forma-36-react-datepicker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/forma-36-react-datepicker",
-  "version": "0.1.1-alpha.78",
+  "version": "0.1.1-alpha.79",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/forma-36-react-datepicker.esm.js",
@@ -31,7 +31,7 @@
     "trailingComma": "es5"
   },
   "devDependencies": {
-    "@contentful/forma-36-react-components": "^3.37.0",
+    "@contentful/forma-36-react-components": "^3.37.1",
     "@testing-library/jest-dom": "^4.2.3",
     "@testing-library/react": "^9.3.2",
     "@types/jest": "^24.0.21",

diff --git a/packages/components/forma-36-react-timepicker/CHANGELOG.md b/packages/components/forma-36-react-timepicker/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.2.0-alpha.76](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-timepicker@0.2.0-alpha.75...@contentful/forma-36-react-timepicker@0.2.0-alpha.76) (2020-05-05)
+
+**Note:** Version bump only for package @contentful/forma-36-react-timepicker
+
+
+
+
+
 # [0.2.0-alpha.75](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-timepicker@0.2.0-alpha.74...@contentful/forma-36-react-timepicker@0.2.0-alpha.75) (2020-04-24)
 
 **Note:** Version bump only for package @contentful/forma-36-react-timepicker

diff --git a/packages/components/forma-36-react-timepicker/package.json b/packages/components/forma-36-react-timepicker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/forma-36-react-timepicker",
-  "version": "0.2.0-alpha.75",
+  "version": "0.2.0-alpha.76",
   "license": "MIT",
   "author": "Johannes Bugiel",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
     "trailingComma": "es5"
   },
   "devDependencies": {
-    "@contentful/forma-36-react-components": "^3.37.0",
+    "@contentful/forma-36-react-components": "^3.37.1",
     "@contentful/forma-36-tokens": "^0.5.2",
     "@testing-library/jest-dom": "^4.2.3",
     "@testing-library/react": "^9.3.2",

diff --git a/packages/forma-36-react-components/CHANGELOG.md b/packages/forma-36-react-components/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.37.1](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-components@3.37.0...@contentful/forma-36-react-components@3.37.1) (2020-05-05)
+
+
+### Bug Fixes
+
+* **Switch:** Replace checked prop with defaultChecked ([cda289d](https://github.com/contentful/forma-36/commit/cda289df905f65999fe60cabd9c838245b2e4748))
+
+
+
+
+
 # [3.37.0](https://github.com/contentful/forma-36/compare/@contentful/forma-36-react-components@3.36.1...@contentful/forma-36-react-components@3.37.0) (2020-04-24)
 
 

diff --git a/packages/forma-36-react-components/package.json b/packages/forma-36-react-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentful/forma-36-react-components",
   "description": "Contentful UI Component Library",
-  "version": "3.37.0",
+  "version": "3.37.1",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",
   "style": "dist/styles.css",

diff --git a/packages/forma-36-react-components/src/components/Switch/Switch.tsx b/packages/forma-36-react-components/src/components/Switch/Switch.tsx
@@ -19,7 +19,7 @@ export const Switch: FunctionComponent<SwitchProps> = (props: SwitchProps) => {
         type="checkbox"
         onClick={onToggle}
         onKeyUp={onKeyUp}
-        checked={props.isChecked}
+        defaultChecked={props.isChecked}
         disabled={props.isDisabled}
         className={classNames(styles['Switch'], {
           [styles['Switch--checked']]: props.isChecked,

diff --git a/packages/forma-36-react-components/src/components/Switch/__snapshots__/Switch.test.tsx.snap b/packages/forma-36-react-components/src/components/Switch/__snapshots__/Switch.test.tsx.snap
@@ -28,8 +28,8 @@ exports[`renders the component as checked 1`] = `
   className="Switch__wrapper"
 >
   <input
-    checked={true}
     className="Switch Switch--checked"
+    defaultChecked={true}
     id="testCheckbox"
     onClick={[Function]}
     onKeyUp={[Function]}
@@ -76,8 +76,8 @@ exports[`renders the component as disabled and checked 1`] = `
   className="Switch__wrapper"
 >
   <input
-    checked={true}
     className="Switch Switch--checked Switch--disabled"
+    defaultChecked={true}
     disabled={true}
     id="testCheckbox"
     onClick={[Function]}

diff --git a/packages/forma-36-website/CHANGELOG.md b/packages/forma-36-website/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.5.8](https://github.com/contentful/forma-36/compare/forma-36-website@0.5.7...forma-36-website@0.5.8) (2020-05-05)
+
+**Note:** Version bump only for package forma-36-website
+
+
+
+
+
 ## [0.5.7](https://github.com/contentful/forma-36/compare/forma-36-website@0.5.6...forma-36-website@0.5.7) (2020-04-24)
 
 **Note:** Version bump only for package forma-36-website

diff --git a/packages/forma-36-website/package.json b/packages/forma-36-website/package.json
@@ -2,10 +2,10 @@
   "name": "forma-36-website",
   "description": "Forma 36 Doc App",
   "private": true,
-  "version": "0.5.7",
+  "version": "0.5.8",
   "dependencies": {
     "@contentful/forma-36-fcss": "^0.0.35",
-    "@contentful/forma-36-react-components": "^3.37.0",
+    "@contentful/forma-36-react-components": "^3.37.1",
     "@contentful/forma-36-tokens": "^0.5.2",
     "@emotion/core": "^10.0.16",
     "@emotion/styled": "^10.0.15",