Merge pull request #1972 from microsoftgraph/merge/main-to-fluentui

chore: merge main to next/fluentui

Author: gavinbarron

.github/workflows/pr-storybook.yml

@@ -33,12 +33,11 @@ jobs:
           yarn storybook:build
 
       - name: Deploy mgt.dev/next/pr/${{ github.event.number }} 🚀
-        uses: JamesIves/github-pages-deploy-action@4.1.1
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
         with:
           branch: gh-pages
           folder: storybook-static
           target-folder: next/pr/${{ github.event.number }}
-          token: ${{ secrets.ACCESS_TOKEN }}
 
       - name: Comment PR
         uses: thollander/actions-comment-pull-request@v1

.github/workflows/pr.yml

@@ -24,6 +24,7 @@ jobs:
       - run: npm install -g yarn
       - run: yarn
       - run: node scripts/setVersion.js --next
+      - run: yarn run tsc -v
       - run: yarn build
       - run: yarn run pack
 

.github/workflows/push-release.yml

@@ -98,7 +98,7 @@ jobs:
           yarn storybook:build
 
       - name: Deploy mgt.dev 🚀
-        uses: JamesIves/github-pages-deploy-action@4.1.1
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
         with:
           branch: gh-pages
           folder: storybook-static

.github/workflows/storybook.yml

@@ -32,12 +32,12 @@ jobs:
           yarn storybook:build
 
       - name: Deploy mgt.dev/next 🚀
-        uses: JamesIves/github-pages-deploy-action@4.1.1
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
         with:
           branch: gh-pages
           folder: storybook-static
           target-folder: next
           clean-exclude: |
             pr
-            fluentui
+            v3
           token: ${{ secrets.GITHUB_TOKEN }}

.storybook/manager-head.html

@@ -93,53 +93,6 @@
 
     sidebarNode.insertBefore(usefulLinksContainer, sidebarNode.childNodes[1]);
 
-    const searchBox = document.querySelector(".search-field");
-    if (searchBox) {
-      searchBox.setAttribute("name", "Find Components");
-      searchBox.setAttribute("aria-expanded", "false");
-
-      const searchInput = searchBox.querySelector("input");
-      if (searchInput) {
-        searchInput.addEventListener("mouseleave", addAriaExpanded("false"));
-        searchInput.addEventListener("mouseout", addAriaExpanded("false"));
-        searchInput.addEventListener("pointerleave", addAriaExpanded("false"));
-        searchInput.addEventListener("pointerout", addAriaExpanded("false"));
-        searchInput.addEventListener("click", addAriaExpanded("true"));
-        searchInput.addEventListener("focusout", addAriaExpanded("false"));
-        searchInput.addEventListener("focus", setListItemsAc11y);
-      }
-    }
-
-    function setListItemsAc11y() {
-      const recentMenu = document.querySelector("#storybook-explorer-menu");
-      if (recentMenu) {
-        const firstLi = recentMenu.querySelector("li");
-        if (firstLi) {
-          firstLi.setAttribute("role", "heading");
-          firstLi.setAttribute("aria-level", "2");
-        }
-
-        const otherLis = recentMenu.querySelectorAll("li:not(:first-child)");
-        if (otherLis && otherLis.length > 0) {
-          for (let i = 0; i < otherLis.length; i++) {
-            const li = otherLis[i];
-            const liText = li.innerText;
-            if (liText) {
-              li.setAttribute("aria-label", liText.trim());
-            }
-            li.setAttribute("aria-hidden", "true");
-          }
-        }
-      }
-    }
-
-    function addAriaExpanded(value) {
-      const searchBox = document.querySelector(".search-field");
-      if (searchBox) {
-        searchBox.setAttribute("aria-expanded", value);
-      }
-    }
-
     const sidebarSubheading = document.getElementsByClassName("sidebar-subheading");
     if (sidebarSubheading) {
       for (let i = 0; i < sidebarSubheading.length; i++) {
@@ -157,6 +110,7 @@
         }
       }
     }
+
     function setArialLabelForExpandCollapseBtn() {
       const expandCollapseBtns = document.getElementsByClassName("css-rl1ij0");
       if (expandCollapseBtns) {
@@ -180,7 +134,6 @@
     }
 
     setEventOnMenuClick();
-    setListItemsAc11y();
   }
 
   function createSvg(svgPath) {
@@ -426,4 +379,15 @@
   .css-8ktt77 {
     display: none;
   }
-</style>
+
+  .css-14o7vtb {
+    border: 2px solid transparent;
+  }
+
+  .css-14o7vtb:focus-visible {
+    outline: auto;
+  }
+  .search-field {
+    display: none !important;
+  }
+</style>

.storybook/preview-body.html

@@ -84,6 +84,10 @@
     color: #e50000 !important;
   }
 
+  .css-3ltsna:focus-visible {
+    outline: auto;
+  }
+
   @media (max-width: 768px) {
     .story-mgt-root {
       flex-direction: column;

.vscode/settings.json

@@ -3,5 +3,6 @@
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.codeActionsOnSave": {
     "source.fixAll.tslint": true
-  }
+  },
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

SECURITY.md

@@ -4,7 +4,7 @@
 
 Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
 
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://learn.microsoft.com/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
 
 ## Reporting Security Issues
 

auth.html

@@ -1,6 +1,6 @@
 <html>
   <head>
-    <script src="https://unpkg.com/@microsoft/teams-js/dist/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
+    <script src="https://unpkg.com/@microsoft/teams-js@2/dist/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
     <!-- <script src="./packages/mgt/dist/bundle/mgt-loader.js"></script>
     <script>
       mgt.TeamsProvider.handleAuth();

index.html

@@ -1,57 +1,56 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <title>Microsoft Graph Toolkit Test</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <title>Microsoft Graph Toolkit Test</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" rel="stylesheet" />
+    <!-- <script src="./node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script> -->
 
-  <link href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" rel="stylesheet" />
-  <!-- <script src="./node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script> -->
+    <script src="https://unpkg.com/@microsoft/teams-js@2/dist/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
 
-  <script src="https://unpkg.com/@microsoft/teams-js/dist/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
+    <!-- <script src="./packages/mgt/dist/bundle/mgt-loader.js"></script> -->
 
-  <!-- <script src="./packages/mgt/dist/bundle/mgt-loader.js"></script> -->
+    <script type="module" src="./packages/mgt/dist/es6/index.js"></script>
+  </head>
 
-  <script type="module" src="./packages/mgt/dist/es6/index.js"></script>
-</head>
-
-<body>
-  <!-- <mgt-teams-provider
+  <body>
+    <!-- <mgt-teams-provider
       client-id="a974dfa0-9f57-49b9-95db-90f04ce2111a"
       auth-popup-url="auth.html"
     ></mgt-teams-provider> -->
 
-  <!-- <mgt-teams-msal2-provider
+    <!-- <mgt-teams-msal2-provider
       client-id="72482bff-ecae-44f5-8fdc-513b7f5602e7"
       scopes="user.read,user.read.all,mail.readBasic,people.read,people.read.all,sites.read.all,user.readbasic.all,contacts.read,presence.read,presence.read.all,tasks.readwrite,tasks.read,calendars.read,group.read.all"
       auth-popup-url="auth.html"
     ></mgt-teams-msal2-provider> -->
 
-  <!-- Teams Msal2 provider in SSO mode (see "teams-sso-node" sample) -->
-  <!-- <mgt-teams-msal2-provider
+    <!-- Teams Msal2 provider in SSO mode (see "teams-sso-node" sample) -->
+    <!-- <mgt-teams-msal2-provider
       client-id="72482bff-ecae-44f5-8fdc-513b7f5602e7"
       scopes="user.read,user.read.all,mail.readBasic,people.read,people.read.all,sites.read.all,user.readbasic.all,contacts.read,presence.read,presence.read.all,tasks.readwrite,tasks.read,calendars.read,group.read.all"
       auth-popup-url="auth.html"
       sso-url="http://localhost:5000/api/token"
       http-method="POST"
     ></mgt-teams-msal2-provider> -->
 
-  <!-- <mgt-msal-provider
+    <!-- <mgt-msal-provider
       client-id="a974dfa0-9f57-49b9-95db-90f04ce2111a"
       scopes="user.read,user.read.all,mail.readBasic,people.read,people.read.all,sites.read.all,user.readbasic.all,contacts.read,presence.read,presence.read.all,tasks.readwrite,tasks.read,calendars.read,group.read.all"
       redirect-uri="http://localhost:3000"
       depends-on="mgt-teams-provider"
     ></mgt-msal-provider> -->
 
-  <!-- <mgt-msal2-provider
+    <!-- <mgt-msal2-provider
       client-id="2dfea037-938a-4ed8-9b35-c05708a1b241"
       redirect-uri="http://localhost:3000"
       scopes="user.read,user.read.all,mail.readBasic,people.read,people.read.all,sites.read.all,user.readbasic.all,contacts.read,presence.read,presence.read.all,tasks.readwrite,tasks.read,calendars.read,group.read.all,files.read,files.read.all,files.readwrite,files.readwrite.all"
     ></mgt-msal2-provider> -->
 
-  <mgt-mock-provider></mgt-mock-provider>
+    <mgt-mock-provider></mgt-mock-provider>
 
     <h1>Developer test page</h1>
     <main>