From f1eabf4326de42887b7ea2798048320bcc9df266 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:41:34 +0300 Subject: [PATCH 01/15] Add missing item type --- .../component/menubar/react/menu-bar-drop-down-indicators.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-drop-down-indicators.tsx b/frontend/demo/component/menubar/react/menu-bar-drop-down-indicators.tsx index 563f2760b3..1ee3f5f1ca 100644 --- a/frontend/demo/component/menubar/react/menu-bar-drop-down-indicators.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-drop-down-indicators.tsx @@ -1,9 +1,9 @@ import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function Example() { - const items = [ + const items : Array = [ { text: 'View' }, { text: 'Edit' }, { From b8cae14e3d7fe76deac8d65fab9693d9fb0da74c Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:44:25 +0300 Subject: [PATCH 02/15] Update menu-bar-basic.tsx --- frontend/demo/component/menubar/react/menu-bar-basic.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-basic.tsx b/frontend/demo/component/menubar/react/menu-bar-basic.tsx index d950992d1e..aa5ceeb917 100644 --- a/frontend/demo/component/menubar/react/menu-bar-basic.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-basic.tsx @@ -9,7 +9,7 @@ function Example() { // tag::snippet[] const selectedItem = useSignal(undefined); - const items = [ + const items: Array = [ { text: 'View' }, { text: 'Edit' }, { From 1f80b88d9584d4687ee913047c307d664f014d24 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:47:45 +0300 Subject: [PATCH 03/15] Update menu-bar-icons.tsx --- frontend/demo/component/menubar/react/menu-bar-icons.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-icons.tsx b/frontend/demo/component/menubar/react/menu-bar-icons.tsx index 6511ed4fef..0d7ebf9389 100644 --- a/frontend/demo/component/menubar/react/menu-bar-icons.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-icons.tsx @@ -2,7 +2,7 @@ import '@vaadin/icons'; import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; import { Icon } from '@vaadin/react-components/Icon.js'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function createItem(iconName: string, text: string, isChild = false) { const iconStyle: React.CSSProperties = { @@ -26,7 +26,7 @@ function createItem(iconName: string, text: string, isChild = false) { function Example() { // tag::snippet[] - const items = [ + const items: Array = [ { component: createItem('share', 'Share'), children: [ From 74353af1897f5c5944bf1392cae289c022df94ec Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:48:33 +0300 Subject: [PATCH 04/15] Update menu-bar-overflow.tsx --- frontend/demo/component/menubar/react/menu-bar-overflow.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-overflow.tsx b/frontend/demo/component/menubar/react/menu-bar-overflow.tsx index 165f2b1faa..cc947772ba 100644 --- a/frontend/demo/component/menubar/react/menu-bar-overflow.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-overflow.tsx @@ -1,11 +1,11 @@ import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; import { SplitLayout } from '@vaadin/react-components/SplitLayout.js'; function Example() { // tag::snippet[] - const items = [ + const items: Array = [ { text: 'View' }, { text: 'Edit' }, { From 2ec9970da7f15d64032d9feccd4ed1b8688c7309 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:53:10 +0300 Subject: [PATCH 05/15] Update menu-bar-right-aligned.tsx --- .../demo/component/menubar/react/menu-bar-right-aligned.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-right-aligned.tsx b/frontend/demo/component/menubar/react/menu-bar-right-aligned.tsx index b5f430be77..5eaadbf96c 100644 --- a/frontend/demo/component/menubar/react/menu-bar-right-aligned.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-right-aligned.tsx @@ -1,9 +1,9 @@ import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function Example() { - const items = [ + const items: Array = [ { text: 'View' }, { text: 'Edit' }, { From e1e820f1fa7c83dd11e07e95764448695a34a37e Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:53:47 +0300 Subject: [PATCH 06/15] Update menu-bar-tooltip.tsx --- frontend/demo/component/menubar/react/menu-bar-tooltip.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-tooltip.tsx b/frontend/demo/component/menubar/react/menu-bar-tooltip.tsx index c855433e66..edceb64cb9 100644 --- a/frontend/demo/component/menubar/react/menu-bar-tooltip.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-tooltip.tsx @@ -2,7 +2,7 @@ import '@vaadin/icons'; import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; import { Icon } from '@vaadin/react-components/Icon.js'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; import { Tooltip } from '@vaadin/react-components/Tooltip.js'; function createItem(iconName: string) { @@ -11,7 +11,7 @@ function createItem(iconName: string) { function Example() { // tag::snippet[] - const items = [ + const items: Array = [ { component: createItem('eye'), tooltip: 'View' }, { component: createItem('pencil'), tooltip: 'Edit' }, { component: createItem('folder'), tooltip: 'Move' }, From a1afed84300224ca2df1f4ab0ecc048f8a5acd70 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:54:48 +0300 Subject: [PATCH 07/15] Update menu-bar-open-on-hover.tsx --- .../demo/component/menubar/react/menu-bar-open-on-hover.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-open-on-hover.tsx b/frontend/demo/component/menubar/react/menu-bar-open-on-hover.tsx index 628fa71f0a..6a3ab58988 100644 --- a/frontend/demo/component/menubar/react/menu-bar-open-on-hover.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-open-on-hover.tsx @@ -1,10 +1,10 @@ import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function Example() { // tag::snippet[] - const items = [ + const items: Array = [ { text: 'View' }, { text: 'Edit' }, { From c8fd58551c4d8f91cf589114adeed81570b7c6fe Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:55:37 +0300 Subject: [PATCH 08/15] Update menu-bar-internationalization.tsx --- .../component/menubar/react/menu-bar-internationalization.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-internationalization.tsx b/frontend/demo/component/menubar/react/menu-bar-internationalization.tsx index 6577c96c3f..f4f5b9c9f0 100644 --- a/frontend/demo/component/menubar/react/menu-bar-internationalization.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-internationalization.tsx @@ -1,9 +1,9 @@ import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; -import { MenuBar, type MenuBarI18n } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, type MenuBarI18n, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function Example() { - const items = [ + const items: Array = [ { text: 'View' }, { text: 'Edit' }, { From 21fb2ee371b1dbdc51cb93a14fa68726b33f84cd Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:56:22 +0300 Subject: [PATCH 09/15] Update menu-bar-icon-only.tsx --- frontend/demo/component/menubar/react/menu-bar-icon-only.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-icon-only.tsx b/frontend/demo/component/menubar/react/menu-bar-icon-only.tsx index 306b1a74fd..8f1b9ebbbf 100644 --- a/frontend/demo/component/menubar/react/menu-bar-icon-only.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-icon-only.tsx @@ -2,7 +2,7 @@ import '@vaadin/icons'; import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; import { Icon } from '@vaadin/react-components/Icon.js'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function createItem(iconName: string, ariaLabel: string) { return ; @@ -10,7 +10,7 @@ function createItem(iconName: string, ariaLabel: string) { function Example() { // tag::snippet[] - const items = [ + const items: Array = [ { component: createItem('eye', 'View') }, { component: createItem('pencil', 'Edit') }, { From a230d80bc6ac67bec9f8941dc726aa506f0b635f Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:56:55 +0300 Subject: [PATCH 10/15] Update menu-bar-drop-down.tsx --- frontend/demo/component/menubar/react/menu-bar-drop-down.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-drop-down.tsx b/frontend/demo/component/menubar/react/menu-bar-drop-down.tsx index 084886d895..74b632cac6 100644 --- a/frontend/demo/component/menubar/react/menu-bar-drop-down.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-drop-down.tsx @@ -1,10 +1,10 @@ import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function Example() { // tag::snippet[] - const items = [ + const items: Array = [ { text: 'John Smith', children: [ From 465f93605df3da7f742e85d3aa00ad9878d7d0da Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:57:36 +0300 Subject: [PATCH 11/15] Update menu-bar-dividers.tsx --- frontend/demo/component/menubar/react/menu-bar-dividers.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-dividers.tsx b/frontend/demo/component/menubar/react/menu-bar-dividers.tsx index e7955b6f99..1bbdacaba3 100644 --- a/frontend/demo/component/menubar/react/menu-bar-dividers.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-dividers.tsx @@ -1,10 +1,10 @@ import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function Example() { // tag::snippet[] - const items = [ + const items: Array = [ { text: 'Share', children: [ From d465a39da1fad68e66d89004159c4f8051fbf034 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:57:58 +0300 Subject: [PATCH 12/15] Update menu-bar-disabled.tsx --- frontend/demo/component/menubar/react/menu-bar-disabled.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-disabled.tsx b/frontend/demo/component/menubar/react/menu-bar-disabled.tsx index 905f0c53c6..72fdaa893f 100644 --- a/frontend/demo/component/menubar/react/menu-bar-disabled.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-disabled.tsx @@ -1,10 +1,10 @@ import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function Example() { // tag::snippet[] - const items = [ + const items: Array = [ { text: 'View' }, { text: 'Edit', disabled: true }, { From 4631df2cff0f5a84df6321086e96e5894664b9a3 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:58:19 +0300 Subject: [PATCH 13/15] Update menu-bar-custom-styling.tsx --- .../demo/component/menubar/react/menu-bar-custom-styling.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-custom-styling.tsx b/frontend/demo/component/menubar/react/menu-bar-custom-styling.tsx index 885a449bc8..26b0608953 100644 --- a/frontend/demo/component/menubar/react/menu-bar-custom-styling.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-custom-styling.tsx @@ -1,10 +1,10 @@ import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function Example() { // tag::snippet[] - const items = [ + const items: Array = [ { text: 'View', className: 'bg-primary text-primary-contrast' }, { text: 'Edit' }, { From 31f237fe1004f6747d94a845ab30b4d47ac47729 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 09:58:43 +0300 Subject: [PATCH 14/15] Update menu-bar-combo-buttons.tsx --- .../demo/component/menubar/react/menu-bar-combo-buttons.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-combo-buttons.tsx b/frontend/demo/component/menubar/react/menu-bar-combo-buttons.tsx index 093290c027..5b1ce9d0f9 100644 --- a/frontend/demo/component/menubar/react/menu-bar-combo-buttons.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-combo-buttons.tsx @@ -2,11 +2,11 @@ import '@vaadin/icons'; import { reactExample } from 'Frontend/demo/react-example'; // hidden-source-line import React from 'react'; import { Icon } from '@vaadin/react-components/Icon.js'; -import { MenuBar } from '@vaadin/react-components/MenuBar.js'; +import { MenuBar, MenuBarItem } from '@vaadin/react-components/MenuBar.js'; function Example() { // tag::snippet[] - const items = [ + const items: Array = [ { text: 'Save' }, { component: , From 3a53e2e83ad5c44c15f9127a7bd6a4e1b6613bd6 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Mon, 28 Apr 2025 10:02:34 +0300 Subject: [PATCH 15/15] Update menu-bar-checkable.tsx --- frontend/demo/component/menubar/react/menu-bar-checkable.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/demo/component/menubar/react/menu-bar-checkable.tsx b/frontend/demo/component/menubar/react/menu-bar-checkable.tsx index d474804425..641a3b3e25 100644 --- a/frontend/demo/component/menubar/react/menu-bar-checkable.tsx +++ b/frontend/demo/component/menubar/react/menu-bar-checkable.tsx @@ -4,6 +4,7 @@ import { useSignals } from '@preact/signals-react/runtime'; // hidden-source-lin import { useSignal } from '@vaadin/hilla-react-signals'; import { MenuBar, + type MenuBarItem, type MenuBarItemSelectedEvent, type SubMenuItem, } from '@vaadin/react-components/MenuBar.js'; @@ -11,7 +12,7 @@ import { function Example() { useSignals(); // hidden-source-line // tag::snippet[] - const items = useSignal([ + const items = useSignal>([ { text: 'Options', children: [{ text: 'Save automatically', checked: true }, { text: 'Notify watchers' }],