diff --git a/packages/react-core/src/components/EmptyState/index.ts b/packages/react-core/src/components/EmptyState/index.ts index 260cabfea97..e30d2d2f3a4 100644 --- a/packages/react-core/src/components/EmptyState/index.ts +++ b/packages/react-core/src/components/EmptyState/index.ts @@ -1,6 +1,4 @@ export * from './EmptyState'; -export * from './EmptyStateHeader'; -export * from './EmptyStateIcon'; export * from './EmptyStateBody'; export * from './EmptyStateFooter'; export * from './EmptyStateActions'; diff --git a/packages/react-core/src/demos/Filters/FilterDemos.md b/packages/react-core/src/demos/Filters/FilterDemos.md index 7307ebdf9b5..baa70a8c47c 100644 --- a/packages/react-core/src/demos/Filters/FilterDemos.md +++ b/packages/react-core/src/demos/Filters/FilterDemos.md @@ -21,9 +21,7 @@ Badge, Pagination, EmptyState, EmptyStateBody, -EmptyStateHeader, EmptyStateFooter, -EmptyStateIcon, EmptyStateActions, Title, Button, @@ -39,34 +37,41 @@ import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table'; ### Search input ```ts file="./examples/FilterSearchInput.tsx" + ``` ### Single select ```ts file="./examples/FilterSingleSelect.tsx" + ``` ### Checkbox select ```ts file="./examples/FilterCheckboxSelect.tsx" + ``` ### Attribute search ```ts file="./examples/FilterAttributeSearch.tsx" + ``` ### Mixed select filter group ```ts file="./examples/FilterMixedSelectGroup.tsx" + ``` ### Single select filter group ```ts file="./examples/FilterSameSelectGroup.tsx" + ``` ### Faceted filter ```ts file="./examples/FilterFaceted.tsx" + ``` diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/Wizard.md b/packages/react-core/src/deprecated/components/Wizard/examples/Wizard.md index 5294ffb25b2..85fab471047 100644 --- a/packages/react-core/src/deprecated/components/Wizard/examples/Wizard.md +++ b/packages/react-core/src/deprecated/components/Wizard/examples/Wizard.md @@ -10,13 +10,12 @@ deprecated: true --- import { Button, Drawer, DrawerActions, DrawerCloseButton, DrawerColorVariant, -DrawerContent, DrawerContentBody, DrawerHead, DrawerPanelContent, DrawerSection, ModalVariant, Alert, EmptyState, EmptyStateHeader, EmptyStateFooter, EmptyStateBody, EmptyStateActions, Title, Progress, Form, FormGroup, TextInput } from '@patternfly/react-core'; +DrawerContent, DrawerContentBody, DrawerHead, DrawerPanelContent, DrawerSection, ModalVariant, Alert, EmptyState, EmptyStateFooter, EmptyStateBody, EmptyStateActions, Title, Progress, Form, FormGroup, TextInput } from '@patternfly/react-core'; import { Wizard as WizardDeprecated, WizardFooter as WizardFooterDeprecated, WizardContextConsumer as WizardContextConsumerDeprecated } from '@patternfly/react-core/deprecated'; import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon'; import SlackHashIcon from '@patternfly/react-icons/dist/esm/icons/slack-hash-icon'; import CogsIcon from '@patternfly/react-icons/dist/esm/icons/cogs-icon'; - If you seek a wizard solution that allows for more composition, see the [React](/components/wizard) tab. ## Examples @@ -24,36 +23,43 @@ If you seek a wizard solution that allows for more composition, see the [React]( ### Basic ```js file="./WizardBasic.tsx" + ``` ### Basic with disabled steps ```js file="./WizardBasicWithDisabledSteps.tsx" + ``` ### Anchors for nav items ```js file="./WizardAnchorsForNavItems.tsx" + ``` ### Incrementally enabled steps ```js file="./WizardIncrementallyEnabledSteps.tsx" + ``` ### Expandable steps ```js file="./WizardExpandableSteps.tsx" + ``` ### Finished ```js file="./WizardFinished.tsx" + ``` ### Enabled on form validation ```js file="./WizardEnabledOnFormValidation.tsx" + ``` ### Validate on button press @@ -74,6 +80,7 @@ interface WizardContext { ``` ```js file="./WizardValidateOnButtonPress.tsx" + ``` ### Progressive steps @@ -81,7 +88,11 @@ interface WizardContext { ```js import React from 'react'; import { Button, Radio, Alert } from '@patternfly/react-core'; -import { Wizard as WizardDeprecated, WizardFooter as WizardFooterDeprecated, WizardContextConsumer as WizardContextConsumerDeprecated } from '@patternfly/react-core/deprecated' +import { + Wizard as WizardDeprecated, + WizardFooter as WizardFooterDeprecated, + WizardContextConsumer as WizardContextConsumerDeprecated +} from '@patternfly/react-core/deprecated'; class ProgressiveWizard extends React.Component { constructor(props) { @@ -367,14 +378,17 @@ class ProgressiveWizard extends React.Component { ### Get current step ```js file="./WizardGetCurrentStep.tsx" + ``` ### Wizard in modal ```js file="./WizardInModal.tsx" + ``` ### Wizard with drawer ```js file="./WizardWithDrawer.tsx" + ``` diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 96bd0841cc8..fd7e486a953 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -35,7 +35,7 @@ "@patternfly/react-tokens": "^6.0.0-alpha.23" }, "devDependencies": { - "@patternfly/documentation-framework": "^6.0.0-alpha.28", + "@patternfly/documentation-framework": "^6.0.0-alpha.42", "@patternfly/patternfly-a11y": "4.3.1" }, "keywords": [ diff --git a/packages/react-table/src/demos/examples/TableEmptyStateDefault.tsx b/packages/react-table/src/demos/examples/TableEmptyStateDefault.tsx index 4b4f6b1aaaa..533d812370f 100644 --- a/packages/react-table/src/demos/examples/TableEmptyStateDefault.tsx +++ b/packages/react-table/src/demos/examples/TableEmptyStateDefault.tsx @@ -6,9 +6,7 @@ import { Card, EmptyState, EmptyStateVariant, - EmptyStateIcon, EmptyStateBody, - EmptyStateHeader, EmptyStateFooter, EmptyStateActions, PageSection @@ -34,12 +32,12 @@ export const TableEmptyStateDefault: React.FunctionComponent = () => ( - - } - titleText="No results found" - headingLevel="h2" - /> + No results match this filter criteria. Clear all filters and try again. diff --git a/packages/react-table/src/demos/examples/TableEmptyStateError.tsx b/packages/react-table/src/demos/examples/TableEmptyStateError.tsx index 82ec0c500d3..fa2b9559f9c 100644 --- a/packages/react-table/src/demos/examples/TableEmptyStateError.tsx +++ b/packages/react-table/src/demos/examples/TableEmptyStateError.tsx @@ -1,15 +1,6 @@ import React from 'react'; import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table'; -import { - Bullseye, - Card, - EmptyState, - EmptyStateVariant, - EmptyStateIcon, - EmptyStateBody, - EmptyStateHeader, - PageSection -} from '@patternfly/react-core'; +import { Bullseye, Card, EmptyState, EmptyStateVariant, EmptyStateBody, PageSection } from '@patternfly/react-core'; import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon'; import { DashboardWrapper } from '@patternfly/react-table/dist/esm/demos/DashboardWrapper'; @@ -31,12 +22,12 @@ export const TableEmptyStateError: React.FunctionComponent = () => ( - - } - headingLevel="h2" - /> + There was an error retrieving data. Check your connection and reload the page. diff --git a/packages/react-table/src/demos/examples/TableEmptyStateLoading.tsx b/packages/react-table/src/demos/examples/TableEmptyStateLoading.tsx index 541790750f0..77693e03edf 100644 --- a/packages/react-table/src/demos/examples/TableEmptyStateLoading.tsx +++ b/packages/react-table/src/demos/examples/TableEmptyStateLoading.tsx @@ -1,14 +1,6 @@ import React from 'react'; import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table'; -import { - Bullseye, - Card, - EmptyState, - EmptyStateIcon, - EmptyStateHeader, - PageSection, - Spinner -} from '@patternfly/react-core'; +import { Bullseye, Card, EmptyState, PageSection, Spinner } from '@patternfly/react-core'; import { DashboardWrapper } from '@patternfly/react-table/dist/esm/demos/DashboardWrapper'; export const TableEmptyStateLoading: React.FunctionComponent = () => ( @@ -29,9 +21,7 @@ export const TableEmptyStateLoading: React.FunctionComponent = () => ( - - } /> - + diff --git a/packages/react-table/src/demos/examples/TableFilterable.tsx b/packages/react-table/src/demos/examples/TableFilterable.tsx index 0d40da804fe..48b4afb27ae 100644 --- a/packages/react-table/src/demos/examples/TableFilterable.tsx +++ b/packages/react-table/src/demos/examples/TableFilterable.tsx @@ -6,8 +6,6 @@ import { EmptyState, EmptyStateActions, EmptyStateBody, - EmptyStateIcon, - EmptyStateHeader, EmptyStateFooter, Label, MenuToggle, @@ -308,12 +306,7 @@ export const TableFilterable: React.FunctionComponent = () => { : rowData; const emptyState = ( - - } - /> + No results match the filter criteria. Clear all filters and try again. diff --git a/yarn.lock b/yarn.lock index d71320e37b0..a9a477c8374 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2091,10 +2091,10 @@ node-addon-api "^3.2.1" node-gyp-build "^4.3.0" -"@patternfly/ast-helpers@^1.4.0-alpha.24": - version "1.4.0-alpha.24" - resolved "https://registry.yarnpkg.com/@patternfly/ast-helpers/-/ast-helpers-1.4.0-alpha.24.tgz#6bcc5634265452670a2bc1736a4ad1fb5d00c94e" - integrity sha512-jHTFs1toP0N6ohki7fHidoM0j5efsxaKBW/RZ5e3axjQtBL+5frgPZgBEqJFKNhKy6UnCw/Ng7ZzqfOZYMZkOQ== +"@patternfly/ast-helpers@^1.4.0-alpha.31": + version "1.4.0-alpha.31" + resolved "https://registry.yarnpkg.com/@patternfly/ast-helpers/-/ast-helpers-1.4.0-alpha.31.tgz#d3fa479a4a4579f49848a9db7826d65ef53dc2aa" + integrity sha512-/UsMH+OTnAP4g6Tmytj6fQ4Zgp88kMQ5Q9KZdVMiXoObN3lJiBcIrg6RrwFEej5OHx+7HA+HF/lRVm8yIMuk0g== dependencies: acorn "^8.4.1" acorn-class-fields "^1.0.0" @@ -2102,16 +2102,16 @@ acorn-static-class-features "^1.0.0" astring "^1.7.5" -"@patternfly/documentation-framework@^6.0.0-alpha.28": - version "6.0.0-alpha.35" - resolved "https://registry.yarnpkg.com/@patternfly/documentation-framework/-/documentation-framework-6.0.0-alpha.35.tgz#797cb7cf83f4b9e09a4d7c8c553ee8d0b53f8fcc" - integrity sha512-UzmtgboxsO4aReLhzJtGLxxr4ktdpdIcwUQJt9RUgvpQq+oJWbXjrFFXL3IWbZGtW1yEJd6nxT6HeUqqcpgoXA== +"@patternfly/documentation-framework@^6.0.0-alpha.42": + version "6.0.0-alpha.42" + resolved "https://registry.yarnpkg.com/@patternfly/documentation-framework/-/documentation-framework-6.0.0-alpha.42.tgz#7220bcd2c6c23c3fb641c9c534da23f32da99573" + integrity sha512-S1Fi/tHYk2dzr+lYmY090x130TR2x2NErf2J9oE0WCZudpfVRK9XyODS2cyy7bUIVkgE5A8W05Ist79RgHJXlA== dependencies: "@babel/core" "^7.24.3" "@babel/preset-env" "^7.24.3" "@babel/preset-react" "^7.24.1" "@mdx-js/util" "1.6.16" - "@patternfly/ast-helpers" "^1.4.0-alpha.24" + "@patternfly/ast-helpers" "^1.4.0-alpha.31" "@reach/router" "npm:@gatsbyjs/reach-router@1.3.9" autoprefixer "9.8.6" babel-loader "^9.1.3" @@ -9981,7 +9981,7 @@ is-date-object@^1.0.1, is-date-object@^1.0.5: dependencies: has-tostringtag "^1.0.0" -is-decimal@^1.0.0: +is-decimal@^1.0.0, is-decimal@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== @@ -16666,7 +16666,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -16752,7 +16752,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -stringify-entities@^3.0.0, stringify-entities@^3.0.1: +stringify-entities@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.1.0.tgz#b8d3feac256d9ffcc9fa1fefdcf3ca70576ee903" integrity sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==