fixed bad JS namespace

This commit is contained in:
pvictor 2020-11-11 10:21:28 +01:00
parent 5560ae0b31
commit 727c9ed3fe
1 changed files with 125 additions and 123 deletions

View File

@ -10,23 +10,24 @@
/// Functions /// Functions
// From Friss tuto (https://github.com/FrissAnalytics/shinyJsTutorials/blob/master/tutorials/tutorial_03.Rmd) // From Friss tuto (https://github.com/FrissAnalytics/shinyJsTutorials/blob/master/tutorials/tutorial_03.Rmd)
function get_widget(id) { var apexcharter = {
getWidget: function(id) {
var htmlWidgetsObj = HTMLWidgets.find("#" + id); var htmlWidgetsObj = HTMLWidgets.find("#" + id);
var widgetObj; var widgetObj;
if (typeof htmlWidgetsObj !== "undefined") { if (typeof htmlWidgetsObj !== "undefined") {
widgetObj = htmlWidgetsObj.getChart(); widgetObj = htmlWidgetsObj.getChart();
} }
return widgetObj; return widgetObj;
} },
function is_single(options) { isSingleSerie: function(options) {
var typeLabels = ["pie", "radialBar", "donut"]; var typeLabels = ["pie", "radialBar", "donut"];
var lab = typeLabels.indexOf(options.w.config.chart.type) > -1; var lab = typeLabels.indexOf(options.w.config.chart.type) > -1;
var single = options.w.config.series.length === 1; var single = options.w.config.series.length === 1;
return lab | single; return lab | single;
} },
function is_datetime(chartContext) { isDatetimeAxis: function(chartContext) {
if ( if (
chartContext.hasOwnProperty("w") && chartContext.hasOwnProperty("w") &&
chartContext.w.hasOwnProperty("config") && chartContext.w.hasOwnProperty("config") &&
@ -37,9 +38,9 @@ function is_datetime(chartContext) {
} else { } else {
return false; return false;
} }
} },
function getSelection(chartContext, selectedDataPoints, serieIndex) { getSelection: function(chartContext, selectedDataPoints, serieIndex) {
var typeLabels = ["pie", "radialBar", "donut"]; var typeLabels = ["pie", "radialBar", "donut"];
var typeXY = ["scatter", "bubble"]; var typeXY = ["scatter", "bubble"];
var selected; var selected;
@ -77,9 +78,9 @@ function getSelection(chartContext, selectedDataPoints, serieIndex) {
selected = null; selected = null;
} }
return selected; return selected;
} },
function getYaxis(axis) { getYaxis: function(axis) {
var yzoom = { min: null, max: null }; var yzoom = { min: null, max: null };
if (typeof axis.yaxis !== "undefined" && axis.yaxis !== null) { if (typeof axis.yaxis !== "undefined" && axis.yaxis !== null) {
var y_axis; var y_axis;
@ -96,9 +97,9 @@ function getYaxis(axis) {
} }
} }
return yzoom; return yzoom;
} },
function getXaxis(axis) { getXaxis: function(axis) {
var xzoom = { min: null, max: null }; var xzoom = { min: null, max: null };
if (typeof axis.xaxis !== "undefined") { if (typeof axis.xaxis !== "undefined") {
var x_axis = axis.xaxis; var x_axis = axis.xaxis;
@ -110,9 +111,9 @@ function getXaxis(axis) {
} }
} }
return xzoom; return xzoom;
} },
function exportChart(x, chart) { exportChart: function(x, chart) {
if (x.hasOwnProperty("shinyEvents") & HTMLWidgets.shinyMode) { if (x.hasOwnProperty("shinyEvents") & HTMLWidgets.shinyMode) {
if (x.shinyEvents.hasOwnProperty("export")) { if (x.shinyEvents.hasOwnProperty("export")) {
setTimeout(function() { setTimeout(function() {
@ -123,6 +124,7 @@ function exportChart(x, chart) {
} }
} }
} }
};
/// Widget /// Widget
@ -196,7 +198,7 @@ HTMLWidgets.widget({
if (typeof opts.selectedDataPoints[i] === "undefined") { if (typeof opts.selectedDataPoints[i] === "undefined") {
continue; continue;
} }
var selection = getSelection( var selection = apexcharter.getSelection(
chartContext, chartContext,
options.selectedDataPoints, options.selectedDataPoints,
i i
@ -210,12 +212,12 @@ HTMLWidgets.widget({
} }
} }
} }
if (is_single(options)) { if (apexcharter.isSingleSerie(options)) {
select = select[Object.keys(select)[0]]; select = select[Object.keys(select)[0]];
} }
Shiny.setInputValue( Shiny.setInputValue(
x.shinyEvents.click.inputId + ":apex_click", x.shinyEvents.click.inputId + ":apex_click",
{ value: select, datetime: is_datetime(chartContext) } { value: select, datetime: apexcharter.isDatetimeAxis(chartContext) }
); );
} else { } else {
Shiny.setInputValue(x.shinyEvents.click.inputId, null); Shiny.setInputValue(x.shinyEvents.click.inputId, null);
@ -225,12 +227,12 @@ HTMLWidgets.widget({
if (x.shinyEvents.hasOwnProperty("zoomed")) { if (x.shinyEvents.hasOwnProperty("zoomed")) {
axOpts.chart.events.zoomed = function(chartContext, xaxis, yaxis) { axOpts.chart.events.zoomed = function(chartContext, xaxis, yaxis) {
var id = x.shinyEvents.zoomed.inputId; var id = x.shinyEvents.zoomed.inputId;
if (is_datetime(chartContext)) { if (apexcharter.isDatetimeAxis(chartContext)) {
id = id + ":apex_datetime"; id = id + ":apex_datetime";
} }
Shiny.setInputValue(id, { Shiny.setInputValue(id, {
x: getXaxis(xaxis), x: apexcharter.getXaxis(xaxis),
y: getYaxis(xaxis) y: apexcharter.getYaxis(xaxis)
}); });
}; };
} }
@ -241,16 +243,16 @@ HTMLWidgets.widget({
yaxis yaxis
) { ) {
var id = x.shinyEvents.selection.inputId; var id = x.shinyEvents.selection.inputId;
if (is_datetime(chartContext)) { if (apexcharter.isDatetimeAxis(chartContext)) {
id = id + ":apex_datetime"; id = id + ":apex_datetime";
} }
var selectionValue; var selectionValue;
if (x.shinyEvents.selection.type === "x") { if (x.shinyEvents.selection.type === "x") {
selectionValue = { x: xaxis.xaxis }; selectionValue = { x: xaxis.xaxis };
} else if (x.shinyEvents.selection.type === "xy") { } else if (x.shinyEvents.selection.type === "xy") {
selectionValue = { x: xaxis.xaxis, y: getYaxis(xaxis) }; selectionValue = { x: xaxis.xaxis, y: apexcharter.getYaxis(xaxis) };
} else if (x.shinyEvents.selection.type === "y") { } else if (x.shinyEvents.selection.type === "y") {
selectionValue = { y: getYaxis(xaxis) }; selectionValue = { y: apexcharter.getYaxis(xaxis) };
} }
Shiny.setInputValue(id, selectionValue); Shiny.setInputValue(id, selectionValue);
}; };
@ -261,7 +263,7 @@ HTMLWidgets.widget({
if (apexchart === null) { if (apexchart === null) {
apexchart = new ApexCharts(el, axOpts); apexchart = new ApexCharts(el, axOpts);
apexchart.render().then(function() { apexchart.render().then(function() {
exportChart(x, apexchart); apexcharter.exportChart(x, apexchart);
}); });
} else { } else {
if (x.auto_update) { if (x.auto_update) {
@ -282,13 +284,13 @@ HTMLWidgets.widget({
apexchart apexchart
.updateSeries(axOpts.series, x.auto_update.series_animate) .updateSeries(axOpts.series, x.auto_update.series_animate)
.then(function(chart) { .then(function(chart) {
exportChart(x, chart); apexcharter.exportChart(x, chart);
}); });
} else { } else {
apexchart.destroy(); apexchart.destroy();
apexchart = new ApexCharts(el, axOpts); apexchart = new ApexCharts(el, axOpts);
apexchart.render().then(function() { apexchart.render().then(function() {
exportChart(x, apexchart); apexcharter.exportChart(x, apexchart);
}); });
} }
} }
@ -313,7 +315,7 @@ HTMLWidgets.widget({
if (HTMLWidgets.shinyMode) { if (HTMLWidgets.shinyMode) {
// update serie // update serie
Shiny.addCustomMessageHandler("update-apexchart-series", function(obj) { Shiny.addCustomMessageHandler("update-apexchart-series", function(obj) {
var chart = get_widget(obj.id); var chart = apexcharter.getWidget(obj.id);
if (typeof chart != "undefined") { if (typeof chart != "undefined") {
chart.updateSeries( chart.updateSeries(
[ [
@ -328,7 +330,7 @@ if (HTMLWidgets.shinyMode) {
// update options // update options
Shiny.addCustomMessageHandler("update-apexchart-options", function(obj) { Shiny.addCustomMessageHandler("update-apexchart-options", function(obj) {
var chart = get_widget(obj.id); var chart = apexcharter.getWidget(obj.id);
if (typeof chart != "undefined") { if (typeof chart != "undefined") {
chart.updateOptions(obj.data.options); chart.updateOptions(obj.data.options);
} }
@ -336,7 +338,7 @@ if (HTMLWidgets.shinyMode) {
// toggle series // toggle series
Shiny.addCustomMessageHandler("update-apexchart-toggle-series", function(obj) { Shiny.addCustomMessageHandler("update-apexchart-toggle-series", function(obj) {
var chart = get_widget(obj.id); var chart = apexcharter.getWidget(obj.id);
if (typeof chart != "undefined") { if (typeof chart != "undefined") {
var seriesName = obj.data.seriesName; var seriesName = obj.data.seriesName;
for(var i = 0; i < seriesName.length; i++) { for(var i = 0; i < seriesName.length; i++) {