From 7a6976294d67ae5e1ad993a557354d14d0f4a34c Mon Sep 17 00:00:00 2001
From: Ashley Ryan <asryan@vmware.com>
Date: Tue, 16 Aug 2022 09:45:35 -0400
Subject: [PATCH] fix: upgrade lit-labs/react version

- adopts the fix for boolean getters and setters from https://github.com/lit/lit/issues/2799#issuecomment-1203178300
- fixes an issue introduced in PR #130 where cds-pagination-button was getting disabled="false" rendered
---
 package-lock.json                             | 18 ++++++-------
 projects/react/package.json                   |  2 +-
 .../button/__snapshots__/index.test.tsx.snap  |  1 -
 projects/react/src/button/index.test.tsx      |  5 ++--
 .../date/__snapshots__/index.test.tsx.snap    |  1 -
 .../file/__snapshots__/index.test.tsx.snap    |  1 -
 .../forms/__snapshots__/index.test.tsx.snap   |  3 ---
 .../icon/__snapshots__/index.test.tsx.snap    | 25 ++++---------------
 .../input/__snapshots__/index.test.tsx.snap   |  2 --
 .../__snapshots__/index.test.tsx.snap         |  1 -
 projects/react/src/pagination/index.test.tsx  |  5 ++--
 .../__snapshots__/index.test.tsx.snap         |  1 -
 .../range/__snapshots__/index.test.tsx.snap   |  4 ---
 .../search/__snapshots__/index.test.tsx.snap  |  6 -----
 .../__snapshots__/index.test.tsx.snap         |  6 -----
 15 files changed, 20 insertions(+), 61 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8df2dbba8..1b845eab1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8517,9 +8517,9 @@
       }
     },
     "node_modules/@lit-labs/react": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.0.4.tgz",
-      "integrity": "sha512-Sy4RCxTZpTE2TwByjVac6gC7jzr8bCQC6s9bJhhJDKos4ZlN2cqcuVz63n0mpSSr1zxFh+Z0o0VR223l36Y4Ag==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.0.8.tgz",
+      "integrity": "sha512-5qQzixu/bVqI819cNgr/fY8KX0v5C3FmanMaT7Q8qzUJ+EpB4BsOSQwacdaWfNkm7SV4jkWerSHxa9hvncszCA==",
       "dev": true
     },
     "node_modules/@lit/reactive-element": {
@@ -68313,7 +68313,7 @@
         "@babel/core": "7.12.0",
         "@babel/preset-env": "7.12.0",
         "@cds/core": "file:./../core/dist/lib",
-        "@lit-labs/react": "^1.0.1",
+        "@lit-labs/react": "^1.0.8",
         "@testing-library/dom": "^8.11.3",
         "@testing-library/jest-dom": "^5.16.2",
         "@testing-library/react": "^12.1.2",
@@ -76178,9 +76178,9 @@
       }
     },
     "@lit-labs/react": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.0.4.tgz",
-      "integrity": "sha512-Sy4RCxTZpTE2TwByjVac6gC7jzr8bCQC6s9bJhhJDKos4ZlN2cqcuVz63n0mpSSr1zxFh+Z0o0VR223l36Y4Ag==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.0.8.tgz",
+      "integrity": "sha512-5qQzixu/bVqI819cNgr/fY8KX0v5C3FmanMaT7Q8qzUJ+EpB4BsOSQwacdaWfNkm7SV4jkWerSHxa9hvncszCA==",
       "dev": true
     },
     "@lit/reactive-element": {
@@ -114021,7 +114021,7 @@
         "@babel/core": "7.12.0",
         "@babel/preset-env": "7.12.0",
         "@cds/core": "file:../core/dist/lib",
-        "@lit-labs/react": "^1.0.1",
+        "@lit-labs/react": "1.0.8",
         "@testing-library/dom": "^8.11.3",
         "@testing-library/jest-dom": "^5.16.2",
         "@testing-library/react": "^12.1.2",
@@ -114032,7 +114032,7 @@
         "@types/react-dom": "^17.0.11",
         "babel-jest": "^28.1.2",
         "jest": "^28.1.2",
-        "jest-environment-jsdom": "28",
+        "jest-environment-jsdom": "^28.1.2",
         "lit": "2.0.2",
         "parcel": "^2.0.0-beta.1",
         "react": "^17.0.2",
diff --git a/projects/react/package.json b/projects/react/package.json
index af87ef7e2..a0c17d558 100644
--- a/projects/react/package.json
+++ b/projects/react/package.json
@@ -17,7 +17,7 @@
     "@babel/core": "7.12.0",
     "@babel/preset-env": "7.12.0",
     "@cds/core": "file:./../core/dist/lib",
-    "@lit-labs/react": "^1.0.1",
+    "@lit-labs/react": "^1.0.8",
     "@testing-library/dom": "^8.11.3",
     "@testing-library/jest-dom": "^5.16.2",
     "@testing-library/react": "^12.1.2",
diff --git a/projects/react/src/button/__snapshots__/index.test.tsx.snap b/projects/react/src/button/__snapshots__/index.test.tsx.snap
index b617847c4..e6a3acabb 100644
--- a/projects/react/src/button/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/button/__snapshots__/index.test.tsx.snap
@@ -18,7 +18,6 @@ exports[`CdsButton snapshot 1`] = `
     danger
   </cds-button>
   <cds-button
-    disabled="true"
     tabindex="0"
   >
     disabled
diff --git a/projects/react/src/button/index.test.tsx b/projects/react/src/button/index.test.tsx
index b7a371f6c..12557274f 100644
--- a/projects/react/src/button/index.test.tsx
+++ b/projects/react/src/button/index.test.tsx
@@ -17,9 +17,8 @@ describe('CdsButton', () => {
 
     expect(await screen.findByRole('button', { name: 'primary' })).toHaveAttribute('status', 'primary');
     expect(await screen.findByRole('button', { name: 'success' })).toHaveAttribute('status', 'success');
-    // There's a lit issue that is resulting in this being 'true' instead of ''
-    // https://github.com/lit/lit/issues/2799#issuecomment-1203178300
-    expect(await screen.findByRole('button', { name: 'disabled' })).toHaveAttribute('disabled', 'true');
+    expect(await screen.findByRole('button', { name: 'disabled' })).toBeDisabled();
+    expect(await screen.findByRole('button', { name: 'disabled' })).toHaveAttribute('disabled', '');
   });
 
   it('snapshot', () => {
diff --git a/projects/react/src/date/__snapshots__/index.test.tsx.snap b/projects/react/src/date/__snapshots__/index.test.tsx.snap
index 3d03de7b4..5b703adf4 100644
--- a/projects/react/src/date/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/date/__snapshots__/index.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`CdsDate snapshot 1`] = `
   <cds-date
     cds-control=""
     control-width="shrink"
-    layout="horizontal"
   >
     <style />
     <label
diff --git a/projects/react/src/file/__snapshots__/index.test.tsx.snap b/projects/react/src/file/__snapshots__/index.test.tsx.snap
index f1f674554..fbb914a3b 100644
--- a/projects/react/src/file/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/file/__snapshots__/index.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`CdsFile snapshot 1`] = `
 <div>
   <cds-file
     cds-control=""
-    layout="vertical"
   >
     <label>
       label
diff --git a/projects/react/src/forms/__snapshots__/index.test.tsx.snap b/projects/react/src/forms/__snapshots__/index.test.tsx.snap
index 20bdced16..b713a4b8d 100644
--- a/projects/react/src/forms/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/forms/__snapshots__/index.test.tsx.snap
@@ -7,7 +7,6 @@ exports[`CdsControl snapshot 1`] = `
   >
     <cds-control
       cds-control=""
-      layout="compact"
     >
       <label>
         label
@@ -23,7 +22,6 @@ exports[`CdsControl snapshot 1`] = `
     </cds-control>
     <cds-control
       cds-control=""
-      layout="compact"
     >
       <label>
         label
@@ -39,7 +37,6 @@ exports[`CdsControl snapshot 1`] = `
     </cds-control>
     <cds-control
       cds-control=""
-      layout="compact"
     >
       <label>
         label
diff --git a/projects/react/src/icon/__snapshots__/index.test.tsx.snap b/projects/react/src/icon/__snapshots__/index.test.tsx.snap
index 6cf99171d..38fff3a7a 100644
--- a/projects/react/src/icon/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/icon/__snapshots__/index.test.tsx.snap
@@ -2,25 +2,10 @@
 
 exports[`CdsIcon snapshot 1`] = `
 <div>
-  <cds-icon
-    shape="user"
-    size="lg"
-  />
-  <cds-icon
-    shape="user"
-    size="lg"
-  />
-  <cds-icon
-    shape="user"
-    size="lg"
-  />
-  <cds-icon
-    shape="user"
-    size="lg"
-  />
-  <cds-icon
-    shape="user"
-    size="lg"
-  />
+  <cds-icon />
+  <cds-icon />
+  <cds-icon />
+  <cds-icon />
+  <cds-icon />
 </div>
 `;
diff --git a/projects/react/src/input/__snapshots__/index.test.tsx.snap b/projects/react/src/input/__snapshots__/index.test.tsx.snap
index 0d11f81c5..2255b5ac5 100644
--- a/projects/react/src/input/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/input/__snapshots__/index.test.tsx.snap
@@ -8,7 +8,6 @@ exports[`CdsInput snapshot 1`] = `
   >
     <cds-input
       cds-control=""
-      layout="vertical"
     >
       <label>
         label
@@ -19,7 +18,6 @@ exports[`CdsInput snapshot 1`] = `
     </cds-input>
     <cds-input
       cds-control=""
-      layout="vertical"
     >
       <label>
         disabled
diff --git a/projects/react/src/pagination/__snapshots__/index.test.tsx.snap b/projects/react/src/pagination/__snapshots__/index.test.tsx.snap
index 8485daa0c..899025e81 100644
--- a/projects/react/src/pagination/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/pagination/__snapshots__/index.test.tsx.snap
@@ -8,7 +8,6 @@ exports[`CdsPagination snapshot 1`] = `
     <style />
     <cds-pagination-button
       aria-label="go to first"
-      disabled="true"
       tabindex="0"
     />
     <cds-pagination-button
diff --git a/projects/react/src/pagination/index.test.tsx b/projects/react/src/pagination/index.test.tsx
index ad82a4d6e..80e9049d4 100644
--- a/projects/react/src/pagination/index.test.tsx
+++ b/projects/react/src/pagination/index.test.tsx
@@ -10,11 +10,12 @@ describe('CdsPagination', () => {
         <CdsPaginationButton aria-label="go to previous" action="prev" disabled></CdsPaginationButton>
         <span aria-label="current page">1 / 3</span>
         <CdsPaginationButton aria-label="go to next" action="next"></CdsPaginationButton>
-        <CdsPaginationButton aria-label="go to last" action="last"></CdsPaginationButton>
+        <CdsPaginationButton aria-label="go to last" action="last" disabled={false}></CdsPaginationButton>
       </CdsPagination>
     );
     expect(document.querySelector('cds-pagination')).toBeInTheDocument();
     expect(await screen.findByRole('button', { name: /go to first/i })).toBeDisabled();
+    expect(await screen.findByRole('button', { name: /go to next/i })).not.toBeDisabled();
     expect(await screen.findByRole('button', { name: /go to last/i })).not.toBeDisabled();
     expect(await screen.findByLabelText('current page')).toHaveTextContent(/1 \/ 3/i);
   });
@@ -23,7 +24,7 @@ describe('CdsPagination', () => {
     const { container } = render(
       <CdsPagination aria-label="pagination">
         <CdsPaginationButton aria-label="go to first" action="prev" disabled></CdsPaginationButton>
-        <CdsPaginationButton aria-label="go to next" action="next"></CdsPaginationButton>
+        <CdsPaginationButton aria-label="go to next" action="next" disabled={false}></CdsPaginationButton>
       </CdsPagination>
     );
     expect(container).toMatchSnapshot();
diff --git a/projects/react/src/password/__snapshots__/index.test.tsx.snap b/projects/react/src/password/__snapshots__/index.test.tsx.snap
index b9da5b908..0b3e26507 100644
--- a/projects/react/src/password/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/password/__snapshots__/index.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`CdsPassword snapshot 1`] = `
 <div>
   <cds-password
     cds-control=""
-    layout="vertical"
   >
     <label>
       label
diff --git a/projects/react/src/range/__snapshots__/index.test.tsx.snap b/projects/react/src/range/__snapshots__/index.test.tsx.snap
index 8b174e2dc..a82b461d4 100644
--- a/projects/react/src/range/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/range/__snapshots__/index.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`CdsRange snapshot 1`] = `
   <cds-form-group>
     <cds-range
       cds-control=""
-      layout="horizontal"
     >
       <style />
       <label>
@@ -22,7 +21,6 @@ exports[`CdsRange snapshot 1`] = `
     </cds-range>
     <cds-range
       cds-control=""
-      layout="horizontal"
     >
       <style />
       <label>
@@ -40,7 +38,6 @@ exports[`CdsRange snapshot 1`] = `
     </cds-range>
     <cds-range
       cds-control=""
-      layout="horizontal"
     >
       <style />
       <label>
@@ -57,7 +54,6 @@ exports[`CdsRange snapshot 1`] = `
     </cds-range>
     <cds-range
       cds-control=""
-      layout="horizontal"
     >
       <style />
       <label>
diff --git a/projects/react/src/search/__snapshots__/index.test.tsx.snap b/projects/react/src/search/__snapshots__/index.test.tsx.snap
index 70a80744d..18c0a7345 100644
--- a/projects/react/src/search/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/search/__snapshots__/index.test.tsx.snap
@@ -62,7 +62,6 @@ exports[`CdsSearch snapshot 1`] = `
     <cds-form-group>
       <cds-search
         cds-control=""
-        layout="horizontal"
       >
         <style />
         <label>
@@ -79,7 +78,6 @@ exports[`CdsSearch snapshot 1`] = `
       </cds-search>
       <cds-search
         cds-control=""
-        layout="horizontal"
       >
         <style />
         <label>
@@ -96,7 +94,6 @@ exports[`CdsSearch snapshot 1`] = `
       </cds-search>
       <cds-search
         cds-control=""
-        layout="horizontal"
       >
         <style />
         <label>
@@ -118,7 +115,6 @@ exports[`CdsSearch snapshot 1`] = `
     <cds-form-group>
       <cds-search
         cds-control=""
-        layout="compact"
       >
         <style />
         <label>
@@ -135,7 +131,6 @@ exports[`CdsSearch snapshot 1`] = `
       </cds-search>
       <cds-search
         cds-control=""
-        layout="compact"
       >
         <style />
         <label>
@@ -152,7 +147,6 @@ exports[`CdsSearch snapshot 1`] = `
       </cds-search>
       <cds-search
         cds-control=""
-        layout="compact"
       >
         <style />
         <label>
diff --git a/projects/react/src/textarea/__snapshots__/index.test.tsx.snap b/projects/react/src/textarea/__snapshots__/index.test.tsx.snap
index a393e31e6..9ab81dedf 100644
--- a/projects/react/src/textarea/__snapshots__/index.test.tsx.snap
+++ b/projects/react/src/textarea/__snapshots__/index.test.tsx.snap
@@ -9,7 +9,6 @@ exports[`CdsTextarea snapshot 1`] = `
     <cds-form-group>
       <cds-textarea
         cds-control=""
-        layout="vertical"
       >
         <label>
           label
@@ -23,7 +22,6 @@ exports[`CdsTextarea snapshot 1`] = `
       </cds-textarea>
       <cds-textarea
         cds-control=""
-        layout="vertical"
       >
         <label>
           error status
@@ -37,7 +35,6 @@ exports[`CdsTextarea snapshot 1`] = `
       </cds-textarea>
       <cds-textarea
         cds-control=""
-        layout="vertical"
       >
         <label>
           success status
@@ -56,7 +53,6 @@ exports[`CdsTextarea snapshot 1`] = `
     <cds-form-group>
       <cds-textarea
         cds-control=""
-        layout="horizontal"
       >
         <label>
           label
@@ -70,7 +66,6 @@ exports[`CdsTextarea snapshot 1`] = `
       </cds-textarea>
       <cds-textarea
         cds-control=""
-        layout="horizontal"
       >
         <label>
           error status
@@ -84,7 +79,6 @@ exports[`CdsTextarea snapshot 1`] = `
       </cds-textarea>
       <cds-textarea
         cds-control=""
-        layout="horizontal"
       >
         <label>
           success status