Skip to content

Commit b234303

Browse files
committed
Merge branch 'main' into feat/ops-tab-ref
2 parents e885ec9 + b942f5f commit b234303

File tree

76 files changed

+1623
-780
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1623
-780
lines changed

.github/ISSUE_TEMPLATE/documentation.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,4 @@ body:
4646
description: By submitting this issue, I confirm to follow the recommendation not to disclose any internal or sensitive information.
4747
options:
4848
- label: I’m not disclosing any internal or sensitive information.
49-
validations:
50-
required: true
49+
required: true

.github/ISSUE_TEMPLATE/feature-request.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,4 @@ body:
5454
description: By submitting this issue, I confirm to follow the recommendation not to disclose any internal or sensitive information.
5555
options:
5656
- label: I’m not disclosing any internal or sensitive information.
57-
validations:
58-
required: true
57+
required: true

.github/workflows/release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ jobs:
9292
--create-release github
9393
env:
9494
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
95-
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
9695
NPM_CONFIG_PROVENANCE: true
9796

9897
- name: build
@@ -102,7 +101,6 @@ jobs:
102101
run: ${GITHUB_WORKSPACE}/node_modules/.bin/lerna publish from-git
103102
env:
104103
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
105-
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
106104
NPM_CONFIG_PROVENANCE: true
107105

108106
### Semantic Release Bot comments for issues and PRs ###

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@ packages/main/scripts/wrapperGeneration/json
2626
packages/main/tmp
2727
packages/*/src/generated/
2828

29+
cypress/downloads
30+
2931
.nx

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.17.1
1+
22.18.0

.storybook/components/ArgTypesWithNote.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { DomRefTable } from '@sb/components/DomRefTable.js';
12
import { ArgTypes } from '@storybook/blocks';
23
import MessageStripDesign from '@ui5/webcomponents/dist/types/MessageStripDesign.js';
34
import { MessageStrip } from '@ui5/webcomponents-react';
@@ -12,20 +13,30 @@ interface ArgTypesWithNotePropTypes {
1213
* Defaults to: "This component supports all HTML attributes."
1314
*/
1415
noteText?: ReactNode | ReactNode[];
16+
/**
17+
* If `true` all headings are rendered as `Heading`s instead of `Subheading`s.
18+
*/
19+
isHeading?: boolean;
1520
}
1621

1722
export function ArgTypesWithNote(props: ComponentProps<typeof ArgTypes> & ArgTypesWithNotePropTypes) {
18-
const { hideHTMLPropsNote, noteText, ...rest } = props;
23+
const { hideHTMLPropsNote, noteText, isHeading, ...rest } = props;
1924

2025
if (hideHTMLPropsNote) {
21-
return <ArgTypes {...rest} />;
26+
return (
27+
<>
28+
<ArgTypes {...rest} />
29+
<DomRefTable of={rest.of} isSubheading={!isHeading} />
30+
</>
31+
);
2232
}
2333
return (
2434
<div className={classes.tableContainer}>
2535
<MessageStrip design={MessageStripDesign.Information} hideCloseButton className={classes.strip}>
2636
{noteText ?? 'This component supports all HTML attributes.'}
2737
</MessageStrip>
2838
<ArgTypes {...rest} />
39+
<DomRefTable of={rest.of} isSubheading={!isHeading} />
2940
</div>
3041
);
3142
}

.storybook/components/DomRefTable.tsx

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { DocsContext, Heading } from '@storybook/blocks';
1+
import type { ArgTypes } from '@storybook/blocks';
2+
import { DocsContext, Heading, Subheading } from '@storybook/blocks';
23
import TagDesign from '@ui5/webcomponents/dist/types/TagDesign.js';
34
import { Tag, Link, MessageStrip, Popover } from '@ui5/webcomponents-react';
45
import type * as CEM from '@ui5/webcomponents-tools/lib/cem/types';
5-
import type { ReactNode } from 'react';
6+
import type { ComponentProps, ReactNode } from 'react';
67
import { Fragment, useContext, useRef } from 'react';
78
import { createPortal } from 'react-dom';
89
import { useGetCem } from '../utils';
@@ -47,14 +48,20 @@ function Name(props: CEM.ClassMember) {
4748
);
4849
}
4950

50-
export function DomRefTable() {
51+
export function DomRefTable({
52+
of,
53+
isSubheading,
54+
}: {
55+
of?: ComponentProps<typeof ArgTypes>['of'];
56+
isSubheading?: boolean;
57+
}) {
5158
const docsContext = useContext(DocsContext);
5259
const storyTags: string[] = docsContext.attachedCSFFile?.meta?.tags;
5360
const cemModuleName = storyTags?.find((tag) => tag.startsWith('cem-module:'));
54-
const componentName = docsContext.componentStories().at(0)?.component?.displayName;
61+
const componentName = of?.displayName ?? docsContext.componentStories().at(0)?.component?.displayName;
5562
const popoverRef = useRef(null);
5663

57-
const knownAttributes = new Set(Object.keys(docsContext.primaryStory?.argTypes ?? {}));
64+
const knownAttributes = new Set(Object.keys(of?.__docgenInfo?.props ?? docsContext.primaryStory?.argTypes ?? {}));
5865
const cem = useGetCem();
5966

6067
const moduleName = cemModuleName ? cemModuleName.split(':')[1] : componentName;
@@ -69,12 +76,13 @@ export function DomRefTable() {
6976
return !(knownAttributes.has(row.name) && !row.type?.text?.includes('HTMLElement'));
7077
}) ?? [];
7178
const cssParts: CEM.CssPart[] = componentMembers?.cssParts ?? [];
79+
const HeadingComponent = isSubheading ? Subheading : Heading;
7280

7381
return (
7482
<>
7583
{rows.length > 0 ? (
7684
<>
77-
<Heading>DOM Properties & Methods</Heading>
85+
<HeadingComponent>DOM Properties & Methods</HeadingComponent>
7886
<p>
7987
This component exposes public properties and methods. You can use them directly on the instance of the
8088
component, e.g. by using React Refs.
@@ -150,7 +158,7 @@ export function DomRefTable() {
150158

151159
{cssParts.length > 0 ? (
152160
<>
153-
<Heading>CSS Shadow Parts</Heading>
161+
<HeadingComponent>CSS Shadow Parts</HeadingComponent>
154162
<p>
155163
<Link target={'_blank'} href={'https://developer.mozilla.org/en-US/docs/Web/CSS/::part'}>
156164
CSS Shadow Parts

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ To consume `ui5-webcomponents-react`, you need to install the npm modules and re
8080
npm install @ui5/webcomponents-react @ui5/webcomponents @ui5/webcomponents-fiori
8181
```
8282

83-
## Ongoing Support for Version 1.x
83+
## End of Support for Version 1.x
8484

85-
We will continue to support version 1.x until end of June 2025, focusing on bug fixes to ensure continuity for our existing users.
85+
The support for version 1.x of `ui5-webcomponents-react` has ended on **July 1, 2025**. We recommend migrating to version 2.x as soon as possible. For more information, please refer to our [Migration Guide](https://sap.github.io/ui5-webcomponents-react/v2/?path=/docs/migration-guide--docs).
8686

8787
<!-- *********************************************************************** -->
8888

docs/Welcome.mdx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ In addition to that, UI5 Web Components for React is providing complex component
2929
- [Node.js](https://nodejs.org/) (**LTS version**)
3030
- If you're using [TypeScript](https://www.typescriptlang.org/) we recommend version **4.7** or later.
3131

32-
## Ongoing Support for Version 1.x
32+
## End of Support for Version 1.x
3333

34-
We will continue to support version 1.x until **end of June 2025**, focusing on bug fixes to ensure continuity for our existing users.
35-
36-
[V1 Release Documentation](https://sap.github.io/ui5-webcomponents-react/v1/?path=/docs/getting-started--docs)
34+
The support for version 1.x of `ui5-webcomponents-react` has ended on **July 1, 2025**. We recommend migrating to version 2.x as soon as possible. For more information, please refer to our [Migration Guide](?path=/docs/migration-guide--docs).
3735

3836
## Getting Started
3937

docs/knowledge-base/FAQ.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import SbTagFilter from '@sb/images/sb-pkg-filter.png';
1414
children={
1515
<>
1616
Please also take a look at the FAQ of{' '}
17-
<ui5-link href="https://sap.github.io/ui5-webcomponents/playground/?path=/docs/docs-faq">
17+
<ui5-link href="https://sap.github.io/ui5-webcomponents/docs/FAQ/">
1818
UI5 Web Components
1919
</ui5-link>
2020
.

0 commit comments

Comments
 (0)