Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Remove converged react-text from examples",
"packageName": "@fluentui/react-examples",
"email": "andredias@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "react-text scaffolding",
"packageName": "@fluentui/react-text",
"email": "andredias@microsoft.com",
"dependentChangeType": "none"
}
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module.exports = {
'<rootDir>/packages/react-menu',
'<rootDir>/packages/react-storybook',
'<rootDir>/packages/react-accordion',
'<rootDir>/packages/react-text',
'<rootDir>/packages/react-portal',
'<rootDir>/packages/react-aria',
],
Expand Down
2 changes: 1 addition & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"@fluentui/react-storybook": { "implicitDependencies": [] },
"@fluentui/react-tabs": { "implicitDependencies": [] },
"@fluentui/react-tabster": { "implicitDependencies": [] },
"@fluentui/react-text": { "implicitDependencies": [] },
"@fluentui/react-text": { "tags": ["vNext", "platform:web"], "implicitDependencies": [] },
"@fluentui/react-theme": { "implicitDependencies": [] },
"@fluentui/react-theme-provider": { "implicitDependencies": [] },
"@fluentui/react-toggle": { "implicitDependencies": [] },
Expand Down
1 change: 0 additions & 1 deletion packages/react-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"@fluentui/react-shared-contexts": "^9.0.0-alpha.15",
"@fluentui/react-slider": "^1.0.0-beta.111",
"@fluentui/react-tabs": "^1.0.0-beta.113",
"@fluentui/react-text": "^0.3.3",
"@fluentui/react-theme": "^9.0.0-alpha.15",
"@fluentui/react-theme-provider": "^9.0.0-alpha.43",
"@fluentui/react-toggle": "^1.0.0-beta.111",
Expand Down
5 changes: 2 additions & 3 deletions packages/react-examples/src/react-button/Playground.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';
import { Checkbox, Dropdown, IDropdownOption, Stack, TextField } from '@fluentui/react';
import { Text } from '@fluentui/react-text';
import { Checkbox, Dropdown, IDropdownOption, Stack, Text, TextField } from '@fluentui/react';
import { PlaygroundProps } from './Playground.types';

const tableStyle: React.CSSProperties = {
Expand Down Expand Up @@ -147,7 +146,7 @@ export const Playground = function <TType>(props: PlaygroundProps<TType>): JSX.E
<React.Fragment key={section.sectionName}>
<tr>
<td style={cellStyle} colSpan={2}>
<Text variant="title3">{section.sectionName}</Text>
<Text variant="medium">{section.sectionName}</Text>
</td>
</tr>
{sectionList}
Expand Down
28 changes: 0 additions & 28 deletions packages/react-examples/src/react-text/Text/Text.stories.tsx

This file was deleted.

11 changes: 11 additions & 0 deletions packages/react-text/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const rootMain = require('../../../.storybook/main');

module.exports = /** @type {Pick<import('../../../.storybook/main').StorybookConfig,'addons'|'stories'|'webpackFinal'>} */ ({
stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/*.stories.@(ts|tsx)'],
addons: [...rootMain.addons],
webpackFinal: (config, options) => {
const localConfig = { ...rootMain.webpackFinal(config, options) };

return localConfig;
},
});
3 changes: 3 additions & 0 deletions packages/react-text/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import * as rootPreview from '../../../.storybook/preview';

export const decorators = [...rootPreview.decorators];
9 changes: 9 additions & 0 deletions packages/react-text/.storybook/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"allowJs": true,
"checkJs": true
},
"exclude": ["../**/*.test.ts", "../**/*.test.js", "../**/*.test.tsx", "../**/*.test.jsx"],
"include": ["../src/**/*", "*.js"]
}
Loading