From 3d6e329ac07637898af1922d483ad5ed1ad8a367 Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 4 Nov 2024 10:47:57 -0600 Subject: [PATCH 1/6] added DayDivider to Beam --- beam/src/components/BeamDayDivider.vue | 38 +++++++++++++++++++ beam/src/index.ts | 3 ++ ...listview-day-divider_2024-11-04-16-47.json | 10 +++++ common/reviews/api/beam.api.md | 3 ++ examples/beam/default.story.vue | 22 +++++++++++ 5 files changed, 76 insertions(+) create mode 100644 beam/src/components/BeamDayDivider.vue create mode 100644 common/changes/@stonecrop/beam/feat-beam-listview-day-divider_2024-11-04-16-47.json diff --git a/beam/src/components/BeamDayDivider.vue b/beam/src/components/BeamDayDivider.vue new file mode 100644 index 00000000..258620a7 --- /dev/null +++ b/beam/src/components/BeamDayDivider.vue @@ -0,0 +1,38 @@ + + + diff --git a/beam/src/index.ts b/beam/src/index.ts index 43486f40..7c031d11 100644 --- a/beam/src/index.ts +++ b/beam/src/index.ts @@ -17,6 +17,7 @@ import BeamHeading from './components/BeamHeading.vue' import BeamArrow from './components/BeamArrow.vue' import BeamBtn from './components/BeamBtn.vue' import BeamProgress from './components/BeamProgress.vue' +import BeamDayDivider from './components/BeamDayDivider.vue' import 'themes/beam.css' /** @@ -42,6 +43,7 @@ function install(app: App /* options */) { app.component('BeamArrow', BeamArrow) app.component('BeamBtn', BeamBtn) app.component('BeamProgress', BeamProgress) + app.component('BeamDayDivider', BeamDayDivider) } export { @@ -57,5 +59,6 @@ export { ListView, Navbar, ScanInput, + BeamDayDivider, install, } diff --git a/common/changes/@stonecrop/beam/feat-beam-listview-day-divider_2024-11-04-16-47.json b/common/changes/@stonecrop/beam/feat-beam-listview-day-divider_2024-11-04-16-47.json new file mode 100644 index 00000000..cf9c5544 --- /dev/null +++ b/common/changes/@stonecrop/beam/feat-beam-listview-day-divider_2024-11-04-16-47.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@stonecrop/beam", + "comment": "added day divider to beam", + "type": "none" + } + ], + "packageName": "@stonecrop/beam" +} \ No newline at end of file diff --git a/common/reviews/api/beam.api.md b/common/reviews/api/beam.api.md index 9dc784b4..1810f5d7 100644 --- a/common/reviews/api/beam.api.md +++ b/common/reviews/api/beam.api.md @@ -6,6 +6,7 @@ import ActionFooter from '@/components/ActionFooter.vue'; import { App } from 'vue'; +import BeamDayDivider from './components/BeamDayDivider.vue'; import BeamMetadata from './components/BeamMetadata.vue'; import BeamModal from '@/components/BeamModal.vue'; import BeamModalOutlet from '@/components/BeamModalOutlet.vue'; @@ -20,6 +21,8 @@ import ScanInput from '@/components/ScanInput.vue'; export { ActionFooter } +export { BeamDayDivider } + export { BeamMetadata } export { BeamModal } diff --git a/examples/beam/default.story.vue b/examples/beam/default.story.vue index bf9da974..5023dc2a 100644 --- a/examples/beam/default.story.vue +++ b/examples/beam/default.story.vue @@ -49,6 +49,28 @@ + + + + + + + + + + + + + + + + + Done + + + From 4ce79d30dc9bfb1277fd7592347a2652b81a7dd6 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 22 Nov 2024 09:48:38 -0600 Subject: [PATCH 2/6] fixed some padding styles for the list elements and updated prefixed variables --- beam/src/components/BeamDayDivider.vue | 11 +++++++---- beam/themes/beam.css | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/beam/src/components/BeamDayDivider.vue b/beam/src/components/BeamDayDivider.vue index 258620a7..8ebf5cdb 100644 --- a/beam/src/components/BeamDayDivider.vue +++ b/beam/src/components/BeamDayDivider.vue @@ -20,19 +20,22 @@ const getDate = computed(() => { .beam_day-divider { text-align: center; padding: 0.4rem; - background: var(--primary-color); - border: 1px solid var(--row-border-color); + background: var(--sc-primary-color); + border: 1px solid var(--sc-row-border-color); border-right: none; border-left: none; box-sizing: border-box; - margin-bottom: 1rem; + margin: 1rem 0; & h2 { text-align: center; font-size: 1rem; - color: var(--primary-text-color); + color: var(--sc-primary-text-color); margin: 0; padding: 0; } } +.beam_day-divider:first-of-type { + margin-top: 0; +} diff --git a/beam/themes/beam.css b/beam/themes/beam.css index 6b6ab25c..cfc6b6b0 100644 --- a/beam/themes/beam.css +++ b/beam/themes/beam.css @@ -90,9 +90,12 @@ body { list-style-type: none; margin: var(--sc-list-margin); padding: 0; - padding-bottom: 2.5em; + /* padding-bottom: 2.5em; */ margin-top: 1px; } +ul.beam_list-view:last-of-type { + padding-bottom: 2.5em; +} .beam_list-item { padding: 0.625rem; From 9f41d336b37e6a5076fc5d6f3c831f44eb67ed27 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 22 Nov 2024 12:09:19 -0600 Subject: [PATCH 3/6] DayDivider now uses linkComponent. Added sample to data.json. --- beam/src/components/BeamDayDivider.vue | 28 +++++++++++++++----------- beam/src/components/ListView.vue | 7 ++++++- beam/src/types/index.ts | 1 + examples/beam/data/items.json | 4 ++++ examples/beam/default.story.vue | 5 ----- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/beam/src/components/BeamDayDivider.vue b/beam/src/components/BeamDayDivider.vue index 8ebf5cdb..c776ac54 100644 --- a/beam/src/components/BeamDayDivider.vue +++ b/beam/src/components/BeamDayDivider.vue @@ -1,25 +1,29 @@