Skip to content

Commit

Permalink
Merge branch 'master' into marcosmoura/feat/selectable-cards
Browse files Browse the repository at this point in the history
* master: (106 commits)
  fix: PopoverTriggerChildProps should be exported (microsoft#25159)
  feat: replace ToolbarRadio implementation by usage of toggle button as Radio (microsoft#25343)
  docs: improve Toolbar docs examples (microsoft#25269)
  feat(tools): add unstable API setup updates (microsoft#25355)
  applying package updates
  Fix wrong narration when legend selected (microsoft#24903)
  applying package updates
  chore(react-persona): Update beachball settings and change file's type (microsoft#25363)
  chore: Refactor Field VR tests to have individual tests per component (microsoft#25263)
  chore(react-persona, react-components, vr-tests-v9): Reverting react-persona's version to beta   (microsoft#25357)
  Publishing migration package (microsoft#25354)
  fix: Detailslist is still tabbable when isHeaderVisible=false (microsoft#25342)
  fix: list even/odd off-by-one issue (microsoft#25358)
  feat: add Dropdown a11y spec (microsoft#24917)
  spinbutton: update internal padding for small size (microsoft#25286)
  chore(global-context): migrate to new package structure (microsoft#25341)
  feat: Add validationState to Progress, to make the bar red or green (microsoft#25253)
  feat: Add accessibility scenarios for Fluent UI v9 components #3 (microsoft#23334)
  feat(Dropdown): Freeform search should be case insensitive (microsoft#24879)
  feat(what-input): Limit keyboard detection in inputs (microsoft#25087)
  ...
  • Loading branch information
marcosmoura committed Oct 25, 2022
2 parents d96c04a + 025e074 commit 0d8c23f
Show file tree
Hide file tree
Showing 1,132 changed files with 23,952 additions and 7,584 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ packages/react-components/react-persona @microsoft/cxe-red @sopranopillow
packages/react-components/react-avatar-context @microsoft/teams-prg
packages/react-components/react-infobutton @microsoft/cxe-red @sopranopillow
packages/react-migration-v8-v9 @microsoft/cxe-coastal @geoffcoxmsft
packages/react-components/react-tree @microsoft/teams-prg
# <%= NX-CODEOWNER-PLACEHOLDER %>


Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/check-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,38 @@ on:
pull_request:

jobs:
dependency-deduplication:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: actions/setup-node@v3
with:
node-version: 14.18.1
cache: 'yarn'

- uses: tj-actions/changed-files@v32
id: changed-files-specific
with:
files: |
yarn.lock
- name: Check package duplicates
if: steps.changed-files-specific.outputs.any_changed == 'true'
run: |
echo "yarn.lock changed! Verifying package deduplication ..."
npx yarn-deduplicate --strategy fewer --list --fail
if [[ $? -ne 0 ]]; then
echo "Your changes introduced package duplication 🚨"
echo "Run 'npx yarn-deduplicate --strategy fewer' to fix those."
else
echo "No duplicate packages introduced ✅"
fi
dependency-mismatches:
runs-on: ubuntu-latest
steps:
Expand Down
34 changes: 19 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@
Fluent UI web represents a collection of utilities, React components, and web components for building web applications.

This repo is home to 3 separate projects today. Mixing components between projects is not currently supported. The goal of these projects is to dedupe functionality and enable interoperability over time. For now, choose the project that best suits your needs.
This repo is home to 3 separate projects today. Combining Fluent UI React v9 components with Fluent UI React v8 or v0 components is possible and allows gradual migration to Fluent UI v9.

The following table will help you navigate the 3 projects and understand their differences.

<!-- prettier-ignore-start -->
| | React | React Northstar | Web Components |
| | React Components (v9) | React (v8) | Web Components |
|---| ----- | --------------- | -------------- |
| **Overview** | Mature, refreshing with new concepts from react-northstar. | Newer, has concepts we're iterating on. | Web Component implementation of Fluent UI. |
| **Used By** | Office| Teams | Edge |
| **Read Me** | [README.md](/packages/react/README.md) | [README.md](/packages/fluentui/README.md) | [README.md](/packages/web-components/README.md) |
| **Changelog** | [CHANGELOG.md](/packages/react/CHANGELOG.md) | [CHANGELOG.md](/packages/fluentui/CHANGELOG.md) | [CHANGELOG.md](/packages/web-components/CHANGELOG.md) |
| **Repo** | [./packages/react](/packages/react) | [./packages/fluentui/react-northstar](/packages/fluentui/react-northstar) | [./packages/web-components](/packages/web-components) |
| **Quick Start** | [Quick Start](https://developer.microsoft.com/en-us/fluentui#/get-started/web) | [Quick Start](https://fluentsite.z22.web.core.windows.net/quick-start) | [See README.md](https://github.com/microsoft/fluentui/tree/master/packages/web-components/README.md) |
| **Docs** | [aka.ms/fluentui-react](https://aka.ms/fluentui-react) | [aka.ms/fluentui-react-northstar](https://aka.ms/fluentui-react-northstar) | [aka.ms/fluentui-web-components](https://aka.ms/fluentui-web-components) |
| **NPM** | `@fluentui/react` | `@fluentui/react-northstar` | `@fluentui/web-components` |
| **Version** | [![npm version](https://img.shields.io/npm/v/@fluentui/react?style=flat-square)](https://www.npmjs.com/package/@fluentui/react) | [![npm version](https://img.shields.io/npm/v/@fluentui/react-northstar?style=flat-square)](https://www.npmjs.com/package/@fluentui/react-northstar) | [![npm version](https://img.shields.io/npm/v/@fluentui/web-components?style=flat-square)](https://www.npmjs.com/package/@fluentui/web-components) |
| **Issues** | [![Fluent UI React GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/Fluent%20UI%20react%20(v8)?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Fluent+UI+react+(v8)%22) | [![Fluent UI React Northstar GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/Fluent%20UI%20react-northstar?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Fluent+UI+react-northstar%22) | [![Fluent UI Web Components GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/web-components?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22web-components%22) |
| **Overview** | New, future-proof and forward looking | Mature | Web Component implementation of Fluent UI. |
| **Used By** | Microsoft 365 | Office | Edge |
| **Read Me** | [README.md](/packages/react-components/react-components/README.md) | [README.md](/packages/react/README.md)| [README.md](/packages/web-components/README.md) |
| **Changelog** | [CHANGELOG.md](/packages/react-components/react-components/CHANGELOG.md) | [CHANGELOG.md](/packages/react/CHANGELOG.md) | [CHANGELOG.md](/packages/web-components/CHANGELOG.md) |
| **Repo** | [packages/react-components](/packages/react-components/react-components/CHANGELOG.md) | [./packages/react](/packages/react) | [./packages/web-components](/packages/web-components) |
| **Quick Start** | [Quick Start](https://react.fluentui.dev/?path=/docs/concepts-developer-quick-start--page) | [Quick Start](https://developer.microsoft.com/en-us/fluentui#/get-started/web) | [See README.md](https://github.com/microsoft/fluentui/tree/master/packages/web-components/README.md) |
| **Docs** | [https://react.fluentui.dev/](https://react.fluentui.dev/) | [aka.ms/fluentui-react](https://aka.ms/fluentui-react) | [aka.ms/fluentui-web-components](https://aka.ms/fluentui-web-components) |
| **NPM** | `@fluentui/react-components` | `@fluentui/react`| `@fluentui/web-components` |
| **Version** | [![npm version](https://img.shields.io/npm/v/@fluentui/react-components?style=flat-square)](https://www.npmjs.com/package/@fluentui/react-components) | [![npm version](https://img.shields.io/npm/v/@fluentui/react?style=flat-square)](https://www.npmjs.com/package/@fluentui/react) | [![npm version](https://img.shields.io/npm/v/@fluentui/web-components?style=flat-square)](https://www.npmjs.com/package/@fluentui/web-components) |
| **Issues** | [![Fluent UI React Components GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/Fluent%20UI%20react-components?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Fluent+UI+react-components+%28v9%29%22) | [![Fluent UI React GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/Fluent%20UI%20react%20(v8)?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Fluent+UI+react+(v8)%22) | [![Fluent UI Web Components GitHub Issues](https://img.shields.io/github/issues/microsoft/fluentui/web-components?label=issues&style=flat-square)](https://github.com/microsoft/fluentui/issues?q=is%3Aissue+is%3Aopen+label%3A%22web-components%22) |
<!-- prettier-ignore-end -->

> Why are there two React versions? See the [FAQ on Fabric and Stardust](https://github.com/microsoft/fluentui/wiki/FAQ---Fabric-and-Stardust-to-Fluent-UI).
> Why are there two React versions? Fluent UI v8 is still widely used. We encourage you to migrate to Fluent UI v9. See the [Migration overview](https://react.fluentui.dev/?path=/docs/concepts-migration-overview--page).
## FluentUI Insights

[Fluent UI Insights](https://docs.microsoft.com/en-us/shows/fluent-ui-insights?utm_source=github) is a series that describes the design and decisions behind the Fluent UI design system.

| EP01: Positioning | EP02: Styling | EP03: Griffel |
| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
| EP01: Positioning | EP02: Styling | EP03: Griffel |
| :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
| <a href="https://learn.microsoft.com/en-us/shows/fluent-ui-insights/fluent-ui-insights-positioning?utm_source=github" target="_blank"><img src="ghdocs/medias/fluentui-ep01-preview.gif" alt="Watch EP01: Positioning" width="240" /></a> | <a href="https://learn.microsoft.com/en-us/shows/fluent-ui-insights/fluent-ui-insights-styling?utm_source=github" target="_blank"><img src="ghdocs/medias/fluentui-ep02-preview.gif" alt="Watch EP02: Styling" width="240" /></a> | <a href="https://learn.microsoft.com/en-us/shows/fluent-ui-insights/fluent-ui-insights-griffel?utm_source=github" target="_blank"><img src="ghdocs/medias/fluentui-ep03-preview.gif" alt="Watch EP03: Griffel" width="240" /></a> |

## Licenses
Expand All @@ -53,6 +53,10 @@ The `office-ui-fabric-react` repo is now this repo (`fluentui` in the Microsoft

We have a lot in store for Fluent UI - [Read our announcement here.](https://developer.microsoft.com/en-us/office/blogs/ui-fabric-is-evolving-into-fluent-ui/)

## Looking for Fluent UI React Northstar?

Fluent UI React Northstar has been superseded by Fluent UI React Components v9. For more details about Fluent UI React Northstar, see its [README.md](/packages/fluentui/README.md).

---

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
12 changes: 6 additions & 6 deletions apps/perf-test-react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"@fluentui/eslint-plugin": "*"
},
"dependencies": {
"@griffel/core": "^1.7.0",
"@fluentui/react-avatar": "^9.2.0",
"@fluentui/react-button": "^9.1.3",
"@fluentui/react-provider": "^9.1.3",
"@fluentui/react-spinbutton": "^9.0.3",
"@fluentui/react-theme": "^9.1.0",
"@griffel/core": "^1.8.0",
"@fluentui/react-avatar": "^9.2.4",
"@fluentui/react-button": "^9.1.6",
"@fluentui/react-provider": "^9.1.5",
"@fluentui/react-spinbutton": "^9.0.6",
"@fluentui/react-theme": "^9.1.1",
"@fluentui/scripts": "^1.0.0",
"@microsoft/load-themed-styles": "^1.10.26",
"flamegrill": "0.2.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/perf-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"dependencies": {
"@fluentui/example-data": "^8.4.2",
"@fluentui/react": "^8.98.0",
"@fluentui/react": "^8.98.7",
"@fluentui/scripts": "^1.0.0",
"@microsoft/load-themed-styles": "^1.10.26",
"flamegrill": "0.2.0",
Expand Down
1 change: 1 addition & 0 deletions apps/public-docsite-resources/config/api-docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ module.exports = {
'TeachingBubble',
'Text',
'TextField',
'TimePicker',
'Toggle',
'Tooltip',
],
Expand Down
12 changes: 6 additions & 6 deletions apps/public-docsite-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
"@fluentui/scripts": "^1.0.0"
},
"dependencies": {
"@fluentui/react": "^8.98.0",
"@fluentui/react": "^8.98.7",
"@fluentui/react-examples": "^8.34.4",
"@microsoft/load-themed-styles": "^1.10.26",
"@fluentui/azure-themes": "^8.5.9",
"@fluentui/react-docsite-components": "^8.10.9",
"@fluentui/font-icons-mdl2": "^8.5.1",
"@fluentui/azure-themes": "^8.5.16",
"@fluentui/react-docsite-components": "^8.10.16",
"@fluentui/font-icons-mdl2": "^8.5.2",
"@fluentui/set-version": "^8.2.2",
"@fluentui/theme-samples": "^8.7.9",
"@fluentui/react-monaco-editor": "^1.7.9",
"@fluentui/theme-samples": "^8.7.16",
"@fluentui/react-monaco-editor": "^1.7.16",
"office-ui-fabric-core": "^11.0.0",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
6 changes: 6 additions & 0 deletions apps/public-docsite-resources/src/AppDefinition.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,12 @@ export const AppDefinition: IAppDefinition = {
name: 'TextField',
url: '#/examples/textfield',
},
{
component: require<any>('./components/pages/TimePickerPage').TimePickerPage,
key: 'TimePicker',
name: 'TimePicker',
url: '#/examples/timepicker',
},
{
component: require<any>('./components/pages/TogglePage').TogglePage,
key: 'Toggle',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import * as React from 'react';
import { DemoPage } from '../DemoPage';

import { TimePickerPageProps } from '@fluentui/react-examples/lib/react/TimePicker/TimePicker.doc';

export const TimePickerPage = (props: { isHeaderVisible: boolean }) => (
<DemoPage
jsonDocs={require('../../../dist/api/react/TimePicker.page.json')}
{...{ ...TimePickerPageProps, ...props }}
/>
);
9 changes: 7 additions & 2 deletions apps/public-docsite-v9/.storybook/main.utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@ function getVnextStories() {
.filter(pkgName => pkgName.startsWith('@fluentui/') && !excludedDependencies.includes(pkgName))
.map(pkgName => {
const name = pkgName.replace('@fluentui/', '');
const storiesGlob = '/src/**/@(index.stories.@(ts|tsx)|*.stories.mdx)';
const storiesGlob = '**/@(index.stories.@(ts|tsx)|*.stories.mdx)';

return `../../../packages/react-components/${name}${storiesGlob}`;
//TODO: simplify once v9 migration [https://github.com/microsoft/fluentui/issues/24129] is complete.
if (fs.existsSync(`../../packages/react-components/${name}/stories/`)) {
return `../../../packages/react-components/${name}/stories/${storiesGlob}`;
} else {
return `../../../packages/react-components/${name}/src/${storiesGlob}`;
}
});
}

Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite-v9/.storybook/manager-head.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
Usign suggested temporary workaround until storybook gets proper support
See https://github.com/microsoft/fluentui/blob/master/rfcs/convergence/authoring-stories.md#10-internal-stories-for-testing
*/
[id*='accessibility-scenario'] {
[id*='accessibility-stories'] {
display: none !important;
}
</style>
11 changes: 7 additions & 4 deletions apps/public-docsite-v9/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,18 @@
"@fluentui/scripts": "^1.0.0"
},
"dependencies": {
"@fluentui/react": "^8.98.0",
"@fluentui/react": "^8.98.7",
"@fluentui/react-northstar": "^0.64.0",
"@fluentui/react-icons-northstar": "^0.64.0",
"@fluentui/scripts": "^1.0.0",
"@fluentui/storybook": "^1.0.0",
"@fluentui/react-components": "^9.4.0",
"@fluentui/react-components": "^9.5.3",
"@fluentui/react-storybook-addon": "^9.0.0-rc.1",
"@fluentui/react-theme": "^9.1.0",
"@griffel/react": "^1.4.0",
"@fluentui/react-theme": "^9.1.1",
"@griffel/react": "^1.4.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-window": "^1.8.6",
"tslib": "^2.1.0"
}
}
Loading

0 comments on commit 0d8c23f

Please sign in to comment.