From a10c75a6654d5ccf076a0f61ee43512c65a7e6d4 Mon Sep 17 00:00:00 2001
From: omsaggau <omsaggau@gmail.com>
Date: Mon, 12 Feb 2024 14:04:52 +0100
Subject: [PATCH] Mim 1753 highmap wrapper (#2514)

* Dont use relative imports to XP files

* fix factbox

* Make wrapper around highmap more like highchart

* Rename part class to wrapper
---
 .../resources/assets/styles/_highchart.scss   |  2 +-
 .../resources/site/macros/highmap/highmap.ts  |  7 ++++
 .../site/parts/highchart/highchart.html       |  2 +-
 .../site/parts/highchart/highchart.ts         |  2 +-
 .../parts/highchartExpert/highchartExpert.ts  |  4 +--
 .../resources/site/parts/highmap/Highmap.jsx  | 32 ++++++++-----------
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/assets/styles/_highchart.scss b/src/main/resources/assets/styles/_highchart.scss
index 5602f78c5..9cdef2f1d 100644
--- a/src/main/resources/assets/styles/_highchart.scss
+++ b/src/main/resources/assets/styles/_highchart.scss
@@ -1,4 +1,4 @@
-.part-highchart {
+.highchart-wrapper {
   .highcharts-credits {
     display: none;
   }
diff --git a/src/main/resources/site/macros/highmap/highmap.ts b/src/main/resources/site/macros/highmap/highmap.ts
index 7b3341054..98e6210d5 100644
--- a/src/main/resources/site/macros/highmap/highmap.ts
+++ b/src/main/resources/site/macros/highmap/highmap.ts
@@ -1,12 +1,19 @@
 import { renderError } from '/lib/ssb/error/error'
+
 import { preview } from '/site/parts/highmap/highmap'
+import { preview as dividerControllerPreview } from '/site/parts/divider/divider'
 import { Highmap } from '.'
 
 export function macro(context: XP.MacroContext<Highmap>) {
   try {
+    const divider: XP.Response = dividerControllerPreview(context.request, {
+      dark: false,
+    })
+
     const highmap = preview(context.request, context.params.highmap)
 
     if (highmap.status && highmap.status !== 200) throw new Error(`Highmap with id ${context.params.highmap} missing`)
+    highmap.body = (divider.body as string) + highmap.body + divider.body
 
     return highmap
   } catch (e) {
diff --git a/src/main/resources/site/parts/highchart/highchart.html b/src/main/resources/site/parts/highchart/highchart.html
index 9074e5649..65475257e 100644
--- a/src/main/resources/site/parts/highchart/highchart.html
+++ b/src/main/resources/site/parts/highchart/highchart.html
@@ -1,4 +1,4 @@
-<section class="xp-part part-highchart" data-th-each="highchart: ${highcharts}">
+<section class="xp-part highchart-wrapper" data-th-each="highchart: ${highcharts}">
   <span data-th-utext="${dataScript}" data-th-remove="tag"></span>
   <div class="row position-relative">
     <div data-th-if="${highchart && highchart.config && highchart.config.draft}" class="alert alert-info mb-4" role="alert" data-th-text="${'Tallet i figuren nedenfor er upublisert'}"></div>
diff --git a/src/main/resources/site/parts/highchart/highchart.ts b/src/main/resources/site/parts/highchart/highchart.ts
index 29ac55d61..c9d19dfad 100644
--- a/src/main/resources/site/parts/highchart/highchart.ts
+++ b/src/main/resources/site/parts/highchart/highchart.ts
@@ -107,7 +107,7 @@ function renderPart(req: XP.Request, highchartIds: Array<string>): XP.Response {
     if (req.mode === 'edit') _req.mode = 'preview'
 
     return r4XpRender('site/parts/highchart/Highchart', HighchartProps, _req, {
-      body: '<section class="xp-part part-highchart"></section>',
+      body: '<section class="xp-part highchart-wrapper"></section>',
     })
   } else {
     return {
diff --git a/src/main/resources/site/parts/highchartExpert/highchartExpert.ts b/src/main/resources/site/parts/highchartExpert/highchartExpert.ts
index dec0730ed..dd150e5cf 100644
--- a/src/main/resources/site/parts/highchartExpert/highchartExpert.ts
+++ b/src/main/resources/site/parts/highchartExpert/highchartExpert.ts
@@ -45,7 +45,7 @@ function renderPart(req: XP.Request): XP.Response {
   }
 
   return r4XpRender('site/parts/highchartExpert/HighchartExpert', { config: component.config.config }, _req, {
-    body: '<section class="xp-part part-highchart-expert"></section>',
+    body: '<section class="xp-part highchart-wrapper-expert"></section>',
   })
 }
 
@@ -60,7 +60,7 @@ function errorConfig(title = 'Feil i JSON konfigurasjon', message = '') {
     Det må begynne med <strong>{</strong> og slutte med <strong>}</strong>`
 
   return {
-    body: `<section class="xp-part part-highchart-expert part-config-error">
+    body: `<section class="xp-part highchart-wrapper-expert part-config-error">
     <h2>Highchart Ekspert - ${title}</h2>
     <p>
      ${_message}
diff --git a/src/main/resources/site/parts/highmap/Highmap.jsx b/src/main/resources/site/parts/highmap/Highmap.jsx
index 9e5046c9c..4da2127a1 100644
--- a/src/main/resources/site/parts/highmap/Highmap.jsx
+++ b/src/main/resources/site/parts/highmap/Highmap.jsx
@@ -16,21 +16,6 @@ if (typeof Highcharts === 'object') {
   require('highcharts/modules/map')(Highcharts)
 }
 
-function renderFootnotes(footnotes) {
-  if (footnotes.length) {
-    return (
-      <Row>
-        {footnotes.map((footnote) => (
-          <Col className='col-12' key={`footnote-${footnote}`}>
-            {footnote && <Text>{footnote}</Text>}
-          </Col>
-        ))}
-      </Row>
-    )
-  }
-  return
-}
-
 function Highmap(props) {
   useEffect(() => {
     if (props.language !== 'en') {
@@ -168,13 +153,22 @@ function Highmap(props) {
   }
 
   return (
-    <section className='part-highmap container'>
+    <section className='xp-part highchart-wrapper'>
       <Row>
-        <Col className='col-12 p-lg-0'>
-          <HighchartsReact highcharts={Highcharts} constructorType={'mapChart'} options={mapOptions} />
+        <Col className='col-12'>
+          <figure className='highcharts-figure mb-0 hide-title'>
+            {mapOptions.title?.text && <figcaption className='figure-title'>{mapOptions.title.text}</figcaption>}
+            {mapOptions.subtitle?.text && <p className='figure-subtitle'>{mapOptions.subtitle.text}</p>}
+            <HighchartsReact highcharts={Highcharts} constructorType={'mapChart'} options={mapOptions} />
+          </figure>
+          {props.footnoteText &&
+            props.footnoteText.map((footnote) => (
+              <Col className='footnote col-12' key={`footnote-${footnote}`}>
+                {footnote && <Text>{footnote}</Text>}
+              </Col>
+            ))}
         </Col>
       </Row>
-      {renderFootnotes(props.footnoteText)}
     </section>
   )
 }