revert errant commit and revert (carbon-design-system#4188)

* Revert "Revert "fix: fixed merge"" This reverts commit c05809f. * Revert "fix: fixed merge" This reverts commit 06fd9ad, reversing changes made to 3518e87.
laurenmrice · Aug 6, 2024 · 4aafdff · 4aafdff
1 parent c05809f
commit 4aafdff
Show file tree

Hide file tree

Showing 330 changed files with 5,997 additions and 1,847 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,19 +1,19 @@
 # Default to system one design and one dev
 
-* @carbon-design-system/developers-system @carbon-design-system/design
+* @carbon-design-system/developers-system-reviewers @carbon-design-system/design
 
 # Diana Tran is the owner for Sustainability Software Patterns
 
 src/pages/community/patterns/login-pattern/*  @dianatran18 @lukefirth
 
 # Eliad Moosavi and Natasha Decoste are the code owners for Data Visualization
 
-src/pages/data-visualization/* @theiliad @natashadecoste
+src/pages/data-visualization/* @theiliad # @natashadecoste
 
 # Zvonimir Fras for Angular tutorial
 
 /src/pages/tutorial/angular/* @zvonimirfras
 
 # Lee Chase for Vue tutorial
 
-/src/pages/tutorial/vue/* @lee-chase
+/src/pages/tutorial/vue/* @lee-chase
diff --git a/.github/ISSUE_TEMPLATE/docs-issue.yaml b/.github/ISSUE_TEMPLATE/docs-issue.yaml
@@ -0,0 +1,96 @@
+name: Documentation issue 📖
+description:
+  Report missing, incorrect, or otherwise inconsistent documentation here.
+title: '[Docs]: '
+labels: 'type: bug 🐛'
+body:
+  - type: markdown
+    attributes:
+      value: '## Welcome!'
+  - type: markdown
+    attributes:
+      value:
+        Thanks for taking the time to fill out this form that will help us make
+        more clear documention.
+
+  - type: dropdown
+    id: project
+    attributes:
+      label: Project
+      description: Where is the problem you're identifying in the documentation?
+      multiple: false
+      options:
+        - https://www.carbondesignsystem.com
+        - https://react.carbondesignsystem.com
+        - https://github.com/carbon-design-system/carbon/tree/main/docs
+    validations:
+      required: true
+
+  - type: input
+    id: section
+    attributes:
+      label: Section
+      description:
+        'Which page are you experiencing the problem with the documentation?'
+      placeholder: https://carbondesignsystem.com/components/accordion/usage/
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description:
+        'Describe the problem you’re experiencing in the documentation. Please
+        attach any screen shots or videos to illustrate the problem.'
+      placeholder:
+        The abc component is missing usage instructions about the xyz prop.
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Solution
+      description:
+        'What would you expect to see instead? Please attach any screen shots or
+        videos to illustrate a possible solution.'
+      placeholder: _Your amazing idea here_
+
+  - type: dropdown
+    id: severity
+    attributes:
+      label: Suggested Severity
+      description:
+        'Read more to understand our [severity
+        levels](https://github.com/carbon-design-system/carbon/blob/main/docs/guides/support.md#severity)'
+      options:
+        - 'Severity 1 = The documentation damages the brand or exposes
+          intellectual property.'
+        - 'Severity 2 = The documentation is wrong or missing major details. It
+          conflicts with what we are saying in another part of the system.	'
+        - "Severity 3 = The documentation is mis-leading, somewhat true, missing
+          minor details, or grammatically incorrect. It doesn't present
+          conflicts with other parts of the design system."
+        - 'Severity 4 = Unrelated to a user task. Content has a typo.'
+
+  - type: input
+    id: application
+    attributes:
+      label: Application
+      description: 'What application do you work on?'
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: Please confirm the following
+      options:
+        - label:
+            I agree to follow this project's [Code of
+            Conduct](https://github.com/carbon-design-system/carbon/blob/f555616971a03fd454c0f4daea184adf41fff05b/.github/CODE_OF_CONDUCT.md)
+          required: true
+        - label:
+            I checked the [current
+            issues](https://github.com/carbon-design-system/carbon/issues) for
+            duplicate problems
diff --git a/.gitignore b/.gitignore
@@ -113,3 +113,6 @@ build-timestamp
 
 .now
 .vercel
+
+# Yarn install state
+.yarn/install-state.gz
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/api/survey.ts b/api/survey.ts
diff --git a/package.json b/package.json
@@ -39,12 +39,12 @@
   "dependencies": {
     "@babel/core": "^7.15.8",
     "@carbon/charts-react": "0.55.0",
-    "@carbon/elements": "^11.40.0",
-    "@carbon/icons": "^11.36.0",
-    "@carbon/icons-react": "^11.36.0",
-    "@carbon/pictograms": "^12.31.0",
-    "@carbon/pictograms-react": "^11.57.0",
-    "@carbon/react": "^1.51.0",
+    "@carbon/elements": "^11.49.0",
+    "@carbon/icons": "^11.45.0",
+    "@carbon/icons-react": "^11.45.0",
+    "@carbon/pictograms": "^12.37.1",
+    "@carbon/pictograms-react": "^11.63.1",
+    "@carbon/react": "^1.61.0",
     "@loadable/component": "^5.15.2",
     "@slack/web-api": "^5.11.0",
     "babel-preset-env": "^1.7.0",
@@ -57,7 +57,7 @@
     "gatsby": "^4.25.7",
     "gatsby-image": "^3.7.1",
     "gatsby-plugin-image": "^2.9.0",
-    "gatsby-theme-carbon": "^3.4.13",
+    "gatsby-theme-carbon": "^3.4.19",
     "lodash-es": "^4.17.15",
     "markdown-it": "^12.3.2",
     "nanoid": "^2.1.11",

diff --git a/src/components/A11yStatus/A11yStatus.js b/src/components/A11yStatus/A11yStatus.js
@@ -24,7 +24,6 @@ import {
   help,
   hidden,
   moreLink,
-  table,
   variant,
   version,
   headingLink,
@@ -397,10 +396,7 @@ const A11yStatus = ({ components, layout }) => {
           <strong>Framework:</strong> React (@carbon/react)
         </p>
         <Row>
-          <Column
-            colLg={12}
-            noGutterSm
-            className={`${table} page-table__container`}>
+          <Column colLg={12} noGutterSm className="page-table__container">
             <table className="page-table">
               <thead>
                 <tr>

diff --git a/src/components/A11yStatusTag/A11yStatusTag.js b/src/components/A11yStatusTag/A11yStatusTag.js
@@ -43,15 +43,15 @@ const A11yStatusTag = ({ tag, tooltip }) => {
 
   const { color, text, definition } = tags[tag];
 
-  return (
+  return tooltip ? (
+    <DefinitionTooltip openOnHover definition={definition}>
+      <Tag type={color} className={styles.tag}>
+        {text}
+      </Tag>
+    </DefinitionTooltip>
+  ) : (
     <Tag type={color} className={styles.tag}>
-      {tooltip ? (
-        <DefinitionTooltip openOnHover definition={definition}>
-          {text}
-        </DefinitionTooltip>
-      ) : (
-        text
-      )}
+      {text}
     </Tag>
   );
 };

diff --git a/src/components/A11yStatusTag/a11y-status-tag.module.scss b/src/components/A11yStatusTag/a11y-status-tag.module.scss
@@ -1,3 +1,12 @@
 :global(.page-table) .tag {
   margin-left: 0;
 }
+
+:global(.cds--popover-container .cds--definition-term) {
+  border: none;
+}
+
+:global(.cds--popover-container .cds--definition-term) .tag span {
+  border-block-end: 1px dotted $border-strong;
+  cursor: pointer;
+}
diff --git a/src/components/ColorTokenTable/ColorTokenTable.js b/src/components/ColorTokenTable/ColorTokenTable.js
@@ -435,6 +435,75 @@ export default class ColorTokenTable extends React.Component {
               </tbody>
             </table>
           </div>
+          <div className="cds--col-lg-7">
+            <h3 className="page-h3">AI</h3>
+          </div>
+          <div className="cds--col-lg-12 cds--no-gutter">
+            <table className="page-table">
+              <thead>
+                <tr>
+                  <th>Token</th>
+                  <th>Role</th>
+                  <th>Value</th>
+                </tr>
+              </thead>
+              <tbody>
+                {Object.keys(colorTokens['ai']).map((token, i) =>
+                  this.renderToken(
+                    token,
+                    colorTokens['ai'][token],
+                    i
+                  )
+                )}
+              </tbody>
+            </table>
+          </div>
+          <div className="cds--col-lg-7">
+            <h3 className="page-h3">Chat</h3>
+          </div>
+          <div className="cds--col-lg-12 cds--no-gutter">
+            <table className="page-table">
+              <thead>
+                <tr>
+                  <th>Token</th>
+                  <th>Role</th>
+                  <th>Value</th>
+                </tr>
+              </thead>
+              <tbody>
+                {Object.keys(colorTokens['chat']).map((token, i) =>
+                  this.renderToken(
+                    token,
+                    colorTokens['chat'][token],
+                    i
+                  )
+                )}
+              </tbody>
+            </table>
+          </div>
+          <div className="cds--col-lg-7">
+            <h3 className="page-h3">Chat button</h3>
+          </div>
+          <div className="cds--col-lg-12 cds--no-gutter">
+            <table className="page-table">
+              <thead>
+                <tr>
+                  <th>Token</th>
+                  <th>Role</th>
+                  <th>Value</th>
+                </tr>
+              </thead>
+              <tbody>
+                {Object.keys(colorTokens['chat-button']).map((token, i) =>
+                  this.renderToken(
+                    token,
+                    colorTokens['chat-button'][token],
+                    i
+                  )
+                )}
+              </tbody>
+            </table>
+          </div>
         </section>
       </div>
     );