From f90da646992a170ff892a512835bf3b8c8098190 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 30 Sep 2024 17:06:07 +1000 Subject: [PATCH 1/3] fix(@dpc-sdp/ripple-ui-core): :bug: fix regression in unflagged mode --- .../breadcrumbs/RplBreadcrumbs.stories.mdx | 22 +++++ .../components/breadcrumbs/RplBreadcrumbs.vue | 98 +++++++++++-------- 2 files changed, 79 insertions(+), 41 deletions(-) diff --git a/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.stories.mdx b/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.stories.mdx index 7435578b3c..7717c0f635 100644 --- a/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.stories.mdx +++ b/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.stories.mdx @@ -82,3 +82,25 @@ This is a more real world example, but this time it's too deep. The ideal number {SingleTemplate.bind()} + +## Example / Collapse inner links + + + + {SingleTemplate.bind()} + + diff --git a/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue b/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue index 3e99df8446..dd7d913763 100644 --- a/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue +++ b/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue @@ -16,12 +16,14 @@ interface Props { items: IRplBreadcrumbsItem[] besideQuickExit?: boolean displayBeforeCollapse?: number + collapse?: boolean } const props = withDefaults(defineProps(), { items: () => [], besideQuickExit: false, - displayBeforeCollapse: 3 + displayBeforeCollapse: 3, + collapse: false }) const emit = defineEmits<{ @@ -50,14 +52,17 @@ const handleClick = (item, index) => { ) } +const initialCollapseInnerLinks = + props.collapse || breadcrumbsCollapseInnerLinks! + const collapseInnerLinks = ref() -collapseInnerLinks.value = - props.items.length > breadcrumbsCollapseInnerLinks! - ? props.displayBeforeCollapse - : 0 +collapseInnerLinks.value = initialCollapseInnerLinks + ? props.displayBeforeCollapse + : 0 const firstItem = (index: number) => index === 0 const lastItem = (index: number) => index === props.items.length - 1 +const secondLastItem = (index: number) => index === props.items.length - 2 const toggleCollapsed = () => { collapseInnerLinks.value = 0 @@ -77,47 +82,58 @@ const toggleCollapsed = () => { v-if="items.length > 0" :class="[ 'rpl-breadcrumbs__items', - 'rpl-type-p-small', + { 'rpl-type-p-small': initialCollapseInnerLinks }, { 'rpl-breadcrumbs__items--collapsed': collapseInnerLinks } ]" > -
  • - {{ item.text }} - +
  • - + + {{ item.text }} - … - - -
    • + + From 19cff964e811db8015d8d072a5233b5ea99fd613 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 30 Sep 2024 17:15:49 +1000 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=F0=9F=94=96=20hotfix=20update=20t?= =?UTF-8?q?o=20ripple=202.17.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 13 +++++++++++++ lerna.json | 2 +- packages/eslint-config-ripple/package.json | 2 +- packages/nuxt-ripple-analytics/package.json | 2 +- packages/nuxt-ripple-cli/package.json | 2 +- packages/nuxt-ripple-preview/package.json | 2 +- packages/nuxt-ripple/package.json | 2 +- packages/ripple-sdp-core/package.json | 2 +- packages/ripple-storybook/package.json | 2 +- packages/ripple-test-utils/package.json | 2 +- packages/ripple-tide-api/package.json | 2 +- packages/ripple-tide-event/package.json | 2 +- packages/ripple-tide-grant/package.json | 2 +- packages/ripple-tide-landing-page/package.json | 2 +- packages/ripple-tide-media/package.json | 2 +- packages/ripple-tide-news/package.json | 2 +- packages/ripple-tide-publication/package.json | 2 +- packages/ripple-tide-search/package.json | 2 +- packages/ripple-tide-topic/package.json | 2 +- packages/ripple-tide-webform/package.json | 2 +- packages/ripple-ui-core/package.json | 2 +- packages/ripple-ui-forms/package.json | 2 +- packages/ripple-ui-maps/package.json | 2 +- packages/stylelint-config-ripple/package.json | 2 +- 24 files changed, 36 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f26b65d883..a369cbab61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## v2.17.2 + +[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/2.17.1...v2.17.2) + + +### 🩹 Fixes + + - **@dpc-sdp/ripple-ui-core:** 🐛 fix regression in unflagged mode ([f90da6469](https://github.com/dpc-sdp/ripple-framework/commit/f90da6469)) + +### ❤️ Contributors + +- Jason Smith + ## v2.17.1 [compare changes](https://github.com/dpc-sdp/ripple-framework/compare/2.17.0...v2.17.1) diff --git a/lerna.json b/lerna.json index fd2c270054..5c969cb02e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.17.1", + "version": "2.17.2", "npmClient": "pnpm", "exact": true, "command": { diff --git a/packages/eslint-config-ripple/package.json b/packages/eslint-config-ripple/package.json index f112290891..d3912b5664 100644 --- a/packages/eslint-config-ripple/package.json +++ b/packages/eslint-config-ripple/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/eslint-config-ripple", "description": "ESLint config for Ripple projects", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "index.js", diff --git a/packages/nuxt-ripple-analytics/package.json b/packages/nuxt-ripple-analytics/package.json index 342047a53a..4cce8cae8b 100644 --- a/packages/nuxt-ripple-analytics/package.json +++ b/packages/nuxt-ripple-analytics/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple-analytics", "description": "Nuxt module for handling event tracking.", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "main": "./nuxt.config.ts", "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/nuxt-ripple-cli/package.json b/packages/nuxt-ripple-cli/package.json index e1f4f3091c..439ed58144 100644 --- a/packages/nuxt-ripple-cli/package.json +++ b/packages/nuxt-ripple-cli/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple-cli", "description": "A CLI for simplifying common setup and scaffolding tasks", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./dist/index.js", diff --git a/packages/nuxt-ripple-preview/package.json b/packages/nuxt-ripple-preview/package.json index 558e2bdf96..833ae0aa24 100644 --- a/packages/nuxt-ripple-preview/package.json +++ b/packages/nuxt-ripple-preview/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple-preview", "description": "Adds support for drupal preview links in Ripple frontend sites", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "main": "./nuxt.config.ts", "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/nuxt-ripple/package.json b/packages/nuxt-ripple/package.json index 4a6560426f..df79416cb7 100644 --- a/packages/nuxt-ripple/package.json +++ b/packages/nuxt-ripple/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple", "description": "Nuxt module for integrating Ripple and Tide", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "main": "./nuxt.config.ts", "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/ripple-sdp-core/package.json b/packages/ripple-sdp-core/package.json index 9be963fb98..f65d0e00e7 100644 --- a/packages/ripple-sdp-core/package.json +++ b/packages/ripple-sdp-core/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-sdp-core", "description": "SDP core content types", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-storybook/package.json b/packages/ripple-storybook/package.json index 6442c06add..5a5f6823b5 100644 --- a/packages/ripple-storybook/package.json +++ b/packages/ripple-storybook/package.json @@ -1,7 +1,7 @@ { "name": "ripple-storybook", "description": "Ripple Storybook instance", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "private": true, "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/ripple-test-utils/package.json b/packages/ripple-test-utils/package.json index 7fe6616899..3c6657ad19 100644 --- a/packages/ripple-test-utils/package.json +++ b/packages/ripple-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-test-utils", "description": "Test utils for Ripple sites", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "type": "module", "main": "./dist/config/index.js", diff --git a/packages/ripple-tide-api/package.json b/packages/ripple-tide-api/package.json index d00ee6c8c7..77c33d0d45 100644 --- a/packages/ripple-tide-api/package.json +++ b/packages/ripple-tide-api/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-api", "description": "Ripple API endpoints for Tide Drupal backend", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./dist/index.js", diff --git a/packages/ripple-tide-event/package.json b/packages/ripple-tide-event/package.json index 4f54834039..5d8bb1b458 100644 --- a/packages/ripple-tide-event/package.json +++ b/packages/ripple-tide-event/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-event", "description": "Ripple mappings and components for Tide Event Content type", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "main": "./nuxt.config.ts", "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/ripple-tide-grant/package.json b/packages/ripple-tide-grant/package.json index f1892573f6..70754a2237 100644 --- a/packages/ripple-tide-grant/package.json +++ b/packages/ripple-tide-grant/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-grant", "description": "Ripple mappings and components for Tide Grant Content type", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-landing-page/package.json b/packages/ripple-tide-landing-page/package.json index 8ed05c4895..fd5e657f4d 100644 --- a/packages/ripple-tide-landing-page/package.json +++ b/packages/ripple-tide-landing-page/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-landing-page", "description": "Ripple mappings and components for Tide landing-page Content type", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-media/package.json b/packages/ripple-tide-media/package.json index 88319670c8..773c04be96 100644 --- a/packages/ripple-tide-media/package.json +++ b/packages/ripple-tide-media/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-media", "description": "Ripple mappings and components for Tide media", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-news/package.json b/packages/ripple-tide-news/package.json index 17ad367c62..88102202de 100644 --- a/packages/ripple-tide-news/package.json +++ b/packages/ripple-tide-news/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-news", "description": "Ripple mappings and components for Tide News content type", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-publication/package.json b/packages/ripple-tide-publication/package.json index f6cfdad12a..e090c33928 100644 --- a/packages/ripple-tide-publication/package.json +++ b/packages/ripple-tide-publication/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-publication", "description": "Ripple mappings and components for Tide Publication Content type", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-search/package.json b/packages/ripple-tide-search/package.json index 1857a433c8..2f311d074c 100644 --- a/packages/ripple-tide-search/package.json +++ b/packages/ripple-tide-search/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-search", "description": "Ripple search UI and services for connecting to Tide search", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-topic/package.json b/packages/ripple-tide-topic/package.json index f9372c752e..ba165c5e53 100644 --- a/packages/ripple-tide-topic/package.json +++ b/packages/ripple-tide-topic/package.json @@ -9,7 +9,7 @@ "./mapping": "./mapping/index.ts", "./types": "./types.ts" }, - "version": "2.17.1", + "version": "2.17.2", "dependencies": { "@dpc-sdp/nuxt-ripple": "workspace:*", "@dpc-sdp/ripple-tide-api": "workspace:*", diff --git a/packages/ripple-tide-webform/package.json b/packages/ripple-tide-webform/package.json index fcdacfadd3..cb4585c9ca 100644 --- a/packages/ripple-tide-webform/package.json +++ b/packages/ripple-tide-webform/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-webform", "description": "Ripple mappings and components for Tide webforms", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-ui-core/package.json b/packages/ripple-ui-core/package.json index 9cf514936b..8f9e476037 100644 --- a/packages/ripple-ui-core/package.json +++ b/packages/ripple-ui-core/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-ui-core", "description": "Ripple UI Core component library", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "files": [ diff --git a/packages/ripple-ui-forms/package.json b/packages/ripple-ui-forms/package.json index 4784ce25b1..ac89b38d4f 100644 --- a/packages/ripple-ui-forms/package.json +++ b/packages/ripple-ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-ui-forms", "description": "A form component library built with Formkit", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./dist/rpl-forms.umd.js", diff --git a/packages/ripple-ui-maps/package.json b/packages/ripple-ui-maps/package.json index 65e86b7a79..3102914fda 100644 --- a/packages/ripple-ui-maps/package.json +++ b/packages/ripple-ui-maps/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-ui-maps", "description": "Ripple UI Core component library", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "files": [ diff --git a/packages/stylelint-config-ripple/package.json b/packages/stylelint-config-ripple/package.json index 8b10847954..9bf822bd0d 100644 --- a/packages/stylelint-config-ripple/package.json +++ b/packages/stylelint-config-ripple/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/stylelint-config-ripple", "description": "ESLint config for Ripple projects", - "version": "2.17.1", + "version": "2.17.2", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "index.js", From 6f9df7b7a223baff66dcde3b00115c30cb770772 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 30 Sep 2024 17:48:47 +1000 Subject: [PATCH 3/3] fix(@dpc-sdp/ripple-ui-core): :bug: set default size --- .../ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue b/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue index dd7d913763..f57bf16496 100644 --- a/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue +++ b/packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue @@ -83,6 +83,7 @@ const toggleCollapsed = () => { :class="[ 'rpl-breadcrumbs__items', { 'rpl-type-p-small': initialCollapseInnerLinks }, + { 'rpl-type-p': !initialCollapseInnerLinks }, { 'rpl-breadcrumbs__items--collapsed': collapseInnerLinks } ]" >