Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions plugins/wp-react-blocks-plugin/blocks/map/BlockSave.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const SaveComponent = (props) => {
dimension1,
dimension2,
dimension3,
extraTooltipColumns,
measures,
filters,
app,
Expand Down Expand Up @@ -154,6 +155,7 @@ const SaveComponent = (props) => {
data-dimension1={dimension1}
data-dimension2={dimension2}
data-dimension3={dimension3}
data-extra-tooltip-columns={encodeURIComponent(JSON.stringify(extraTooltipColumns))}
data-enabled-layers={encodeURIComponent(JSON.stringify(enabledLayers))}
data-point-label-color={pointLabelColor}
data-point-label-format={pointLabelFormat}
Expand Down
69 changes: 54 additions & 15 deletions plugins/wp-react-blocks-plugin/blocks/map/Tooltips.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Component } from "@wordpress/element";
import { __ } from "@wordpress/i18n";
import {
Button,
CheckboxControl,
PanelBody,
PanelRow,
SelectControl,
Expand All @@ -18,6 +19,7 @@ function APITooltipGuide({
dimension1 = "none",
dimension2 = "none",
dimension3 = "none",
extraTooltipColumns = [],
filters = [],
}) {
return (
Expand Down Expand Up @@ -90,32 +92,30 @@ function APITooltipGuide({
</PanelRow>
)}

<Divider height={8}/>

<Text size="xSmall" style={{ fontSize: '12px', marginTop: '4px'}}>MEASURES</Text>
{allMeasures &&
allMeasures.map((m) => (
<PanelRow key={m}>
{extraTooltipColumns && extraTooltipColumns.length > 0 && extraTooltipColumns.map((col) => {
const dim = allDimensions.find((d) => d.value === col);
return (
<PanelRow key={col}>
<p
style={{
"margin-top": "4px",
"font-size": "11px",
"font-size": "12px",
"font-style": "normal",
color: "rgb(117, 117, 117)",
}}
>
{m.label} -&gt; {"{" + m.value + "}"}
{(dim ? dim.label : col)}: {"{" + col + "}"}
</p>
</PanelRow>
))}
);
})}

<Divider height={8}/>

<Text size="xSmall" style={{ fontSize: '12px', marginTop: '4px'}}>DIMENSIONS</Text>

{allDimensions &&
allDimensions.map((d) => (
<PanelRow key={d}>
<Text size="xSmall" style={{ fontSize: '12px', marginTop: '4px'}}>MEASURES</Text>
{allMeasures &&
allMeasures.map((m) => (
<PanelRow key={m}>
<p
style={{
"margin-top": "4px",
Expand All @@ -124,7 +124,7 @@ function APITooltipGuide({
color: "rgb(117, 117, 117)",
}}
>
{d.label} -&gt; {"{" + d.value + "}"}
{m.label} -&gt; {"{" + m.value + "}"}
</p>
</PanelRow>
))}
Expand Down Expand Up @@ -219,6 +219,7 @@ export default class Tooltips extends Component {
dimension1,
dimension2,
dimension3,
extraTooltipColumns,
measures,
filters,
},
Expand Down Expand Up @@ -273,16 +274,54 @@ export default class Tooltips extends Component {
<div style={{ marginTop: "4px", marginBottom: "4px" }}/>
{app === "csv" && <CSVTooltipGuide />}

{app !== "csv" && (
<PanelBody
initialOpen={false}
title={__("Extra Tooltip Columns")}
>
<PanelRow>
<p
style={{
fontSize: "12px",
fontStyle: "italic",
color: "#666",
margin: "0",
}}
>
{__(
"Additional fields to expose as tooltip variables, without adding them as dimensions.",
)}
</p>
</PanelRow>
{allDimensions && allDimensions.filter(d => d.value !== 'none').map((d) => (
<PanelRow key={d.value}>
<CheckboxControl
label={d.label}
checked={extraTooltipColumns.indexOf(d.value) > -1}
onChange={(checked) => {
const newValue = checked
? [...extraTooltipColumns, d.value]
: extraTooltipColumns.filter((v) => v !== d.value);
setAttributes({ extraTooltipColumns: newValue });
}}
/>
</PanelRow>
))}
</PanelBody>
)}

{app !== "csv" && (
<APITooltipGuide
allMeasures={allMeasures}
dimension1={dimension1}
dimension2={dimension2}
dimension3={dimension3}
extraTooltipColumns={extraTooltipColumns}
filters={filters}
allDimensions={allDimensions}
/>
)}

<PanelRow>
<TextareaControl
label={__("Tooltip Format")}
Expand Down
4 changes: 4 additions & 0 deletions plugins/wp-react-blocks-plugin/blocks/map/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ registerBlockType(BLOCKS_NS + '/map',
type: 'String',
default: 'none'
},
extraTooltipColumns: {
type: 'Array',
default: []
},
app: {
type: 'String',
default: "csv"
Expand Down
Loading