From 78af0de0944b2f1f3b12efe617310b67996bc3ea Mon Sep 17 00:00:00 2001 From: jonahtanjz Date: Mon, 28 Jun 2021 11:26:27 +0800 Subject: [PATCH 1/7] Shift id in panel div container to span.anchor --- packages/vue-components/src/Panel.vue | 1 + packages/vue-components/src/panels/MinimalPanel.vue | 11 +++++++++++ packages/vue-components/src/panels/NestedPanel.vue | 11 +++++++++++ packages/vue-components/src/panels/PanelBase.js | 3 +++ 4 files changed, 26 insertions(+) diff --git a/packages/vue-components/src/Panel.vue b/packages/vue-components/src/Panel.vue index 918c3c57a6..834920346e 100644 --- a/packages/vue-components/src/Panel.vue +++ b/packages/vue-components/src/Panel.vue @@ -20,6 +20,7 @@ import nestedPanel from './panels/NestedPanel.vue'; import minimalPanel from './panels/MinimalPanel.vue'; export default { + inheritAttrs: false, components: { nestedPanel, minimalPanel, diff --git a/packages/vue-components/src/panels/MinimalPanel.vue b/packages/vue-components/src/panels/MinimalPanel.vue index ed52444e96..8ecafbd4ba 100644 --- a/packages/vue-components/src/panels/MinimalPanel.vue +++ b/packages/vue-components/src/panels/MinimalPanel.vue @@ -4,6 +4,11 @@ ref="cardContainer" :class="['card-container', addClass]" > + + + + + + + + +
+ + +
+
+ + + + + + +`; + exports[`NestedPanels should not show header after expand with expandHeaderless as true 1`] = `
+ +
@@ -97,6 +182,8 @@ exports[`NestedPanels should show header after expand with expandHeaderless as f
+ +
@@ -190,6 +277,8 @@ exports[`NestedPanels should show header when collapsed with expandHeaderless as
+ +
@@ -268,6 +357,8 @@ exports[`NestedPanels should show header when collapsed with expandHeaderless as
+ +
From a849691161ad3f6deaa36faeca4c6d1a1eb23915 Mon Sep 17 00:00:00 2001 From: jonahtanjz Date: Mon, 28 Jun 2021 12:01:49 +0800 Subject: [PATCH 3/7] Remove card-container css and its css logic --- packages/core-web/src/index.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/core-web/src/index.js b/packages/core-web/src/index.js index 7cadea09e0..cefc7c0ca4 100644 --- a/packages/core-web/src/index.js +++ b/packages/core-web/src/index.js @@ -49,7 +49,6 @@ function detectAndApplyFixedHeaderStyles() { top: calc(-${headerHeight}px - ${bufferHeight}rem) }`, ); - insertCss(`.card-container { scroll-margin-top: calc(${headerHeight}px + ${bufferHeight}rem); }`); insertCss(`.nav-menu-open { max-height: calc(100% - ${headerHeight}px); }`); const adjustHeaderClasses = () => { @@ -68,9 +67,6 @@ function detectAndApplyFixedHeaderStyles() { case 'span.anchor': rules[0].style.top = `calc(-${newHeaderHeight}px - ${bufferHeight}rem)`; break; - case '.card-container': - rules[0].style.scrollMarginTop = `calc(${newHeaderHeight}px + ${bufferHeight}rem)`; - break; case '.nav-menu-open': rules[0].style.maxHeight = `calc(100% - ${newHeaderHeight}px + 50px)`; break; From 9bffe460dc9c5270edf70ac32cb73551a6c4b497 Mon Sep 17 00:00:00 2001 From: jonahtanjz Date: Tue, 29 Jun 2021 23:28:35 +0800 Subject: [PATCH 4/7] Update id to panelId --- packages/core/src/html/headerProcessor.js | 2 +- packages/core/test/unit/html/NodeProcessor.data.js | 2 +- packages/core/test/unit/html/NodeProcessor.test.js | 2 +- packages/vue-components/src/Panel.vue | 12 ++++++++++-- packages/vue-components/src/__tests__/Panels.spec.js | 4 ++-- packages/vue-components/src/panels/MinimalPanel.vue | 5 ++--- packages/vue-components/src/panels/NestedPanel.vue | 5 ++--- packages/vue-components/src/panels/PanelBase.js | 10 +++++++--- 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/packages/core/src/html/headerProcessor.js b/packages/core/src/html/headerProcessor.js index aab48bb4f8..4cf71f22cb 100644 --- a/packages/core/src/html/headerProcessor.js +++ b/packages/core/src/html/headerProcessor.js @@ -76,7 +76,7 @@ function assignPanelId(node) { + 'Please report this to the MarkBind developers. Thank you!'); } - node.attribs.id = header.attribs.id; + node.attribs.panelId = header.attribs.id; } } diff --git a/packages/core/test/unit/html/NodeProcessor.data.js b/packages/core/test/unit/html/NodeProcessor.data.js index 1c1668a1e9..2423342c2d 100644 --- a/packages/core/test/unit/html/NodeProcessor.data.js +++ b/packages/core/test/unit/html/NodeProcessor.data.js @@ -50,7 +50,7 @@ module.exports.POST_PROCESS_PANEL_ID_ASSIGNED_USING_HEADER_SLOT = ` `; module.exports.POST_PROCESS_PANEL_ID_ASSIGNED_USING_HEADER_SLOT_EXPECTED = ` - + Header and alt attributes should be processed and inserted under panel as slots and internal slots respectively and deleted. `; diff --git a/packages/core/test/unit/html/NodeProcessor.test.js b/packages/core/test/unit/html/NodeProcessor.test.js index 407c7e8c64..e3026e658d 100644 --- a/packages/core/test/unit/html/NodeProcessor.test.js +++ b/packages/core/test/unit/html/NodeProcessor.test.js @@ -121,7 +121,7 @@ test('processNode processes box attributes and inserts into dom as slots correct testData.PROCESS_BOX_HEADING_EXPECTED); }); -test('postProcessNode assigns the correct header id to panels', () => { +test('postProcessNode assigns the correct panel id to panels', () => { processAndVerifyTemplate(testData.POST_PROCESS_PANEL_ID_ASSIGNED_USING_HEADER_SLOT, testData.POST_PROCESS_PANEL_ID_ASSIGNED_USING_HEADER_SLOT_EXPECTED, true); diff --git a/packages/vue-components/src/Panel.vue b/packages/vue-components/src/Panel.vue index 834920346e..0f693ef7e5 100644 --- a/packages/vue-components/src/Panel.vue +++ b/packages/vue-components/src/Panel.vue @@ -1,11 +1,16 @@