@mwater/visualization 5.2.0 → 5.3.1

package/lib/wellknown.js

@@ -0,0 +1,288 @@
+"use strict";
+/*
+
+https://github.com/mapbox/wellknown
+
+Copyright (c) 2016, Mapbox
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringify = exports.parse = void 0;
+const numberRegexp = /[-+]?([0-9]*\.[0-9]+|[0-9]+)([eE][-+]?[0-9]+)?/;
+// Matches sequences like '100 100' or '100 100 100'.
+const tuples = new RegExp('^' + numberRegexp.source + '(\\s' + numberRegexp.source + '){1,}');
+/*
+ * Parse WKT and return GeoJSON.
+ *
+ * @param {string} _ A WKT geometry
+ * @return {?Object} A GeoJSON geometry object
+ */
+function parse(input) {
+    let parts = input.split(';');
+    let _ = parts.pop();
+    let srid = (parts.shift() || '').split('=').pop() || '';
+    let i = 0;
+    function $(re) {
+        let match = _.substring(i).match(re);
+        if (!match)
+            return null;
+        else {
+            i += match[0].length;
+            return match[0];
+        }
+    }
+    function crs(obj) {
+        if (obj && srid.match(/\d+/)) {
+            obj.crs = {
+                type: 'name',
+                properties: {
+                    name: 'urn:ogc:def:crs:EPSG::' + srid
+                }
+            };
+        }
+        return obj;
+    }
+    function white() { $(/^\s*/); }
+    function multicoords() {
+        white();
+        let depth = 0;
+        let rings = [];
+        let stack = [rings];
+        let pointer = rings;
+        let elem;
+        while (elem =
+            $(/^(\()/) ||
+                $(/^(\))/) ||
+                $(/^(,)/) ||
+                $(tuples)) {
+            if (elem === '(') {
+                stack.push(pointer);
+                pointer = [];
+                stack[stack.length - 1].push(pointer);
+                depth++;
+            }
+            else if (elem === ')') {
+                // For the case: Polygon(), ...
+                if (pointer.length === 0)
+                    return null;
+                pointer = stack.pop() || [];
+                // the stack was empty, input was malformed
+                if (!pointer)
+                    return null;
+                depth--;
+                if (depth === 0)
+                    break;
+            }
+            else if (elem === ',') {
+                pointer = [];
+                stack[stack.length - 1].push(pointer);
+            }
+            else if (!elem.split(/\s/g).some(s => isNaN(s))) {
+                Array.prototype.push.apply(pointer, elem.split(/\s/g).map(parseFloat));
+            }
+            else {
+                return null;
+            }
+            white();
+        }
+        if (depth !== 0)
+            return null;
+        return rings;
+    }
+    function coords() {
+        let list = [];
+        let item;
+        let pt;
+        while (pt =
+            $(tuples) ||
+                $(/^(,)/)) {
+            if (pt === ',') {
+                list.push(item);
+                item = [];
+            }
+            else if (!pt.split(/\s/g).some(s => isNaN(s))) {
+                if (!item)
+                    item = [];
+                Array.prototype.push.apply(item, pt.split(/\s/g).map(parseFloat));
+            }
+            white();
+        }
+        if (item)
+            list.push(item);
+        else
+            return null;
+        return list.length ? list : null;
+    }
+    function point() {
+        if (!$(/^(point(\sz)?)/i))
+            return null;
+        white();
+        if (!$(/^(\()/))
+            return null;
+        let c = coords();
+        if (!c)
+            return null;
+        white();
+        if (!$(/^(\))/))
+            return null;
+        return {
+            type: 'Point',
+            coordinates: c[0]
+        };
+    }
+    function multipoint() {
+        if (!$(/^(multipoint(\sz)?)/i))
+            return null;
+        white();
+        let newCoordsFormat = _
+            .substring(_.indexOf('(') + 1, _.length - 1)
+            .replace(/\(/g, '')
+            .replace(/\)/g, '');
+        _ = 'MULTIPOINT (' + newCoordsFormat + ')';
+        let c = multicoords();
+        if (!c)
+            return null;
+        white();
+        return {
+            type: 'MultiPoint',
+            coordinates: c
+        };
+    }
+    function multilinestring() {
+        if (!$(/^(multilinestring(\sz)?)/i))
+            return null;
+        white();
+        let c = multicoords();
+        if (!c)
+            return null;
+        white();
+        return {
+            type: 'MultiLineString',
+            coordinates: c
+        };
+    }
+    function linestring() {
+        if (!$(/^(linestring(\sz)?)/i))
+            return null;
+        white();
+        if (!$(/^(\()/))
+            return null;
+        let c = coords();
+        if (!c)
+            return null;
+        if (!$(/^(\))/))
+            return null;
+        return {
+            type: 'LineString',
+            coordinates: c
+        };
+    }
+    function polygon() {
+        if (!$(/^(polygon(\sz)?)/i))
+            return null;
+        white();
+        let c = multicoords();
+        if (!c)
+            return null;
+        return {
+            type: 'Polygon',
+            coordinates: c
+        };
+    }
+    function multipolygon() {
+        if (!$(/^(multipolygon(\sz)?)/i))
+            return null;
+        white();
+        let c = multicoords();
+        if (!c)
+            return null;
+        return {
+            type: 'MultiPolygon',
+            coordinates: c
+        };
+    }
+    function geometrycollection() {
+        let geometries = [];
+        let geometry;
+        if (!$(/^(geometrycollection)/i))
+            return null;
+        white();
+        if (!$(/^(\()/))
+            return null;
+        while (geometry = root()) {
+            geometries.push(geometry);
+            white();
+            $(/^(,)/);
+            white();
+        }
+        if (!$(/^(\))/))
+            return null;
+        return {
+            type: 'GeometryCollection',
+            geometries: geometries
+        };
+    }
+    function root() {
+        return point() ||
+            linestring() ||
+            polygon() ||
+            multipoint() ||
+            multilinestring() ||
+            multipolygon() ||
+            geometrycollection();
+    }
+    return crs(root());
+}
+exports.parse = parse;
+/**
+ * Stringifies a GeoJSON object into WKT
+ */
+function stringify(gj) {
+    if (gj.type === 'Feature') {
+        gj = gj.geometry;
+    }
+    function pairWKT(c) {
+        return c.join(' ');
+    }
+    function ringWKT(r) {
+        return r.map(pairWKT).join(', ');
+    }
+    function ringsWKT(r) {
+        return r.map(ringWKT).map(wrapParens).join(', ');
+    }
+    function multiRingsWKT(r) {
+        return r.map(ringsWKT).map(wrapParens).join(', ');
+    }
+    function wrapParens(s) { return '(' + s + ')'; }
+    switch (gj.type) {
+        case 'Point':
+            return 'POINT (' + pairWKT(gj.coordinates) + ')';
+        case 'LineString':
+            return 'LINESTRING (' + ringWKT(gj.coordinates) + ')';
+        case 'Polygon':
+            return 'POLYGON (' + ringsWKT(gj.coordinates) + ')';
+        case 'MultiPoint':
+            return 'MULTIPOINT (' + ringWKT(gj.coordinates) + ')';
+        case 'MultiPolygon':
+            return 'MULTIPOLYGON (' + multiRingsWKT(gj.coordinates) + ')';
+        case 'MultiLineString':
+            return 'MULTILINESTRING (' + ringsWKT(gj.coordinates) + ')';
+        case 'GeometryCollection':
+            return 'GEOMETRYCOLLECTION (' + gj.geometries.map(stringify).join(', ') + ')';
+        default:
+            throw new Error('stringify requires a valid GeoJSON Feature or geometry object as input');
+    }
+}
+exports.stringify = stringify;

package/lib/widgets/DropdownWidgetComponent.d.ts

@@ -1,31 +1,14 @@
-/// <reference types="jquery" />
-/// <reference types="bootstrap" />
-import React from "react";
+import React, { ReactNode } from "react";
 export interface DropdownWidgetComponentProps {
     /** Width specification */
     width?: any;
     /** Height specification */
     height?: any;
-    dropdownItems: any;
-}
-export default class DropdownWidgetComponent extends React.Component<DropdownWidgetComponentProps> {
-    renderDropdownItem: (item: any, i: any) => React.DetailedReactHTMLElement<React.HTMLAttributes<HTMLElement>, HTMLElement>;
-    renderDropdown(): React.ReactElement<{
-        style: {
-            position: string;
-            right: number;
-            top: number;
-            cursor: string;
-            zIndex: number;
-        };
-    }, string | React.JSXElementConstructor<any>> | null;
-    closeMenu: () => JQuery<HTMLElement>;
-    render(): React.DetailedReactHTMLElement<{
-        className: string;
-        onMouseLeave: () => JQuery<HTMLElement>;
-        style: {
-            width: any;
-            height: any;
-        };
-    }, HTMLElement>;
+    dropdownItems: {
+        label: ReactNode;
+        onClick: () => void;
+    }[];
+    children?: ReactNode;
 }
+declare const DropdownWidgetComponent: (props: DropdownWidgetComponentProps) => React.JSX.Element;
+export default DropdownWidgetComponent;

package/lib/widgets/DropdownWidgetComponent.js

@@ -1,20 +1,39 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = __importDefault(require("lodash"));
-const jquery_1 = __importDefault(require("jquery"));
-const react_1 = __importDefault(require("react"));
-const react_dom_1 = __importDefault(require("react-dom"));
-const R = react_1.default.createElement;
+const react_1 = __importStar(require("react"));
 // Widget wrapper that adds a dropdown menu in a gear floating
-class DropdownWidgetComponent extends react_1.default.Component {
-    renderDropdownItem = (item, i) => {
-        return R("li", { key: `${i}` }, R("a", { className: "dropdown-item", onClick: item.onClick }, item.icon ? R("span", { className: `glyphicon glyphicon-${item.icon} text-muted` }) : undefined, item.icon ? " " : undefined, item.label));
+const DropdownWidgetComponent = (props) => {
+    const { width, height, dropdownItems, children } = props;
+    const dropdownRef = (0, react_1.useRef)(null);
+    const renderDropdownItem = (item, i) => {
+        return (react_1.default.createElement("li", { key: `${i}` },
+            react_1.default.createElement("a", { className: "dropdown-item", onClick: item.onClick }, item.label)));
     };
-    renderDropdown() {
-        if (this.props.dropdownItems.length === 0) {
+    const renderDropdown = () => {
+        if (dropdownItems.length === 0) {
             return null;
         }
         const dropdownStyle = {
@@ -24,18 +43,22 @@ class DropdownWidgetComponent extends react_1.default.Component {
             cursor: "pointer",
             zIndex: 1029
         };
-        const elem = R("div", { style: dropdownStyle, "data-bs-toggle": "dropdown" }, R("div", { className: "mwater-visualization-simple-widget-gear-button" }, R("span", { className: "fas fa-cog" })));
-        return R("div", { style: dropdownStyle }, elem, R("ul", { className: "dropdown-menu dropdown-menu-end", style: { top: 25 } }, lodash_1.default.map(this.props.dropdownItems, this.renderDropdownItem)));
-    }
-    closeMenu = () => {
-        return (0, jquery_1.default)(react_dom_1.default.findDOMNode(this)).find('[data-bs-toggle="dropdown"]').parent().removeClass("open");
+        return (react_1.default.createElement("div", { style: dropdownStyle, ref: dropdownRef },
+            react_1.default.createElement("div", { style: dropdownStyle, "data-bs-toggle": "dropdown" },
+                react_1.default.createElement("div", { className: "mwater-visualization-simple-widget-gear-button" },
+                    react_1.default.createElement("span", { className: "fas fa-cog" }))),
+            react_1.default.createElement("ul", { className: "dropdown-menu dropdown-menu-end", style: { top: 25 } }, dropdownItems.map(renderDropdownItem))));
     };
-    render() {
-        return R("div", {
-            className: "mwater-visualization-simple-widget",
-            onMouseLeave: this.closeMenu,
-            style: { width: this.props.width, height: this.props.height }
-        }, this.props.children, this.renderDropdown());
-    }
-}
+    const closeMenu = (0, react_1.useCallback)(() => {
+        if (dropdownRef.current) {
+            const dropdownToggle = dropdownRef.current.querySelector('[data-bs-toggle="dropdown"]');
+            if (dropdownToggle) {
+                dropdownToggle.parentElement?.classList.remove('open');
+            }
+        }
+    }, []);
+    return (react_1.default.createElement("div", { className: "mwater-visualization-simple-widget", onMouseLeave: closeMenu, style: { width, height } },
+        children,
+        renderDropdown()));
+};
 exports.default = DropdownWidgetComponent;

package/lib/widgets/IFrameWidgetComponent.d.ts

@@ -1,5 +1,4 @@
 import React from "react";
-import DropdownWidgetComponent from "./DropdownWidgetComponent";
 import ModalPopupComponent from "@mwater/react-library/lib/ModalPopupComponent";
 export interface IFrameWidgetComponentProps {
     design: any;
@@ -21,6 +20,6 @@ export default class IFrameWidgetComponent extends React.Component<IFrameWidgetC
         className: string;
         onClick: () => void;
     }, HTMLElement>;
-    render(): React.CElement<import("./DropdownWidgetComponent").DropdownWidgetComponentProps, DropdownWidgetComponent>;
+    render(): React.FunctionComponentElement<import("./DropdownWidgetComponent").DropdownWidgetComponentProps>;
 }
 export {};

package/lib/widgets/ImageWidgetComponent.d.ts

@@ -1,7 +1,6 @@
 import React from "react";
 import AsyncLoadComponent from "@mwater/react-library/lib/AsyncLoadComponent";
 import AutoSizeComponent from "@mwater/react-library/lib/AutoSizeComponent";
-import DropdownWidgetComponent from "./DropdownWidgetComponent";
 import ModalPopupComponent from "@mwater/react-library/lib/ModalPopupComponent";
 import { DataSource, Schema } from "@mwater/expressions";
 import { WidgetDataSource } from "./WidgetDataSource";
@@ -25,7 +24,7 @@ export default class ImageWidgetComponent extends AsyncLoadComponent<ImageWidget
 }> {
     editor: ImageWidgetDesignComponent | null;
     isLoadNeeded(newProps: ImageWidgetComponentProps, oldProps: ImageWidgetComponentProps): boolean;
-    load(props: ImageWidgetComponentProps, prevProps: ImageWidgetComponentProps, callback: any): void;
+    load(props: ImageWidgetComponentProps, prevProps: ImageWidgetComponentProps, callback: any): void | AbortController | undefined;
     handleStartEditing: () => void;
     renderEditLink(): React.DetailedReactHTMLElement<{
         className: string;
@@ -34,7 +33,7 @@ export default class ImageWidgetComponent extends AsyncLoadComponent<ImageWidget
     renderEditor(): React.CElement<any, ImageWidgetDesignComponent>;
     renderExpression(): React.DetailedReactHTMLElement<React.HTMLAttributes<HTMLElement>, HTMLElement> | React.CElement<import("@mwater/react-library/lib/AutoSizeComponent").AutoSizeComponentProps, AutoSizeComponent> | null;
     renderContent(): React.DetailedReactHTMLElement<React.HTMLAttributes<HTMLElement>, HTMLElement> | React.CElement<import("@mwater/react-library/lib/AutoSizeComponent").AutoSizeComponentProps, AutoSizeComponent> | React.CElement<RotatedImageComponentProps, RotatedImageComponent> | null;
-    render(): React.CElement<import("./DropdownWidgetComponent").DropdownWidgetComponentProps, DropdownWidgetComponent>;
+    render(): React.FunctionComponentElement<import("./DropdownWidgetComponent").DropdownWidgetComponentProps>;
 }
 interface ImageWidgetDesignComponentProps {
     design: any;

package/lib/widgets/MapWidget.d.ts

@@ -26,6 +26,8 @@ interface MapWidgetComponentProps {
     /** called with (scope) as a scope to apply to self and filter to apply to other widgets. See WidgetScoper for details */
     onScopeChange?: any;
     onRowClick?: any;
+    /** TODO: implement refreshing */
+    refreshKey?: any;
 }
 interface MapWidgetComponentState {
     editDesign: any;

package/lib/widgets/MapWidget.js

@@ -60,7 +60,8 @@ class MapWidget extends Widget_1.default {
             onScopeChange: options.onScopeChange,
             width: options.width,
             height: options.height,
-            onRowClick: options.onRowClick
+            onRowClick: options.onRowClick,
+            refreshKey: options.refreshKey
         });
     }
     // Get a list of table ids that can be filtered on

package/lib/widgets/TOCWidget.js

@@ -151,6 +151,7 @@ class TOCWidgetViewComponent extends react_1.default.Component {
         onScrollToTOCEntry: prop_types_1.default.func
     };
     handleEntryClick = (tocEntry) => {
+        debugger;
         return this.props.onScrollToTOCEntry?.(tocEntry.widgetId, tocEntry.id);
     };
     renderTOCEntry(tocEntry, index) {
@@ -203,7 +204,7 @@ class TOCWidgetViewComponent extends react_1.default.Component {
             return this.renderTOCEntry(tocEntry, i);
         }), 
         // Add placeholder if none and editable
-        this.props.onDesignChange && this.props.tocEntries.length === 0
+        this.props.onDesignChange && (this.props.tocEntries || []).length === 0
             ? R("div", { className: "text-muted" }, "Table of Contents will appear here as text blocks with headings are added to the dashboard")
             : undefined);
     }

package/lib/widgets/Widget.d.ts

@@ -39,6 +39,8 @@ export interface CreateViewElementOptions {
     widgetRef?: (widget: any) => void;
     /** called with (widgetId, tocEntryId) to scroll to TOC entry */
     onScrollToTOCEntry?: (widgetId: string, tocEntryId: string) => void;
+    /** A key that changes when the widget should be refreshed */
+    refreshKey?: any;
 }
 export default class Widget {
     /** Creates a React element that is a view of the widget */

package/lib/widgets/WidgetDataSource.d.ts

@@ -10,8 +10,10 @@ export interface WidgetDataSource {
      *  design: design of the widget. Ignored in the case of server-side rendering
      *  filters: array of filters to apply. Each is { table: table id, jsonql: jsonql condition with {alias} for tableAlias. Use injectAlias to correct
      *  callback: (error, data)
+     *
+     * Can be aborted by cancelling the AbortController
      */
-    getData(design: any, filters: JsonQLFilter[], callback: (error: any, data?: any) => void): void;
+    getData(design: any, filters: JsonQLFilter[], callback: (error: any, data?: any) => void): AbortController | void | undefined;
     /** For map widgets, the following is required */
     getMapDataSource?(design: MapDesign): MapDataSource;
     /** Get the url to download an image (by id from an image or imagelist column)

package/lib/widgets/charts/Chart.d.ts

@@ -48,7 +48,6 @@ export default class Chart {
     createViewElement(options: ChartCreateViewElementOptions): ReactNode;
     createDropdownItems(design: any, schema: Schema, widgetDataSource: WidgetDataSource, filters: any): {
         label: ReactNode;
-        icon?: string;
         onClick: () => void;
     }[];
     createDataTable(design: any, schema: Schema, dataSource: DataSource, data: any, locale: any): any[][];

package/lib/widgets/charts/ChartViewComponent.d.ts

@@ -24,6 +24,8 @@ export interface ChartViewComponentProps {
     /** called with (scope) as a scope to apply to self and filter to apply to other widgets. See WidgetScoper for details */
     onScopeChange?: (scope: WidgetScope | null) => void;
     onRowClick?: (tableId: string, rowId: any) => void;
+    /** A key that changes when the widget should be refreshed */
+    refreshKey?: any;
 }
 interface ChartViewComponentState {
     cacheExpiry?: any;
@@ -40,6 +42,8 @@ interface ChartViewComponentState {
 export default class ChartViewComponent extends React.Component<ChartViewComponentProps, ChartViewComponentState> {
     /** Ordinal of update (0, 1, 2...) to ensure using latest */
     updateSeq: number;
+    /** Abort controller for the current data load */
+    abortController: AbortController | undefined;
     constructor(props: ChartViewComponentProps);
     componentDidMount(): void;
     componentDidUpdate(prevProps: ChartViewComponentProps): void;

package/lib/widgets/charts/ChartViewComponent.js

@@ -13,6 +13,8 @@ const R = react_1.default.createElement;
 class ChartViewComponent extends react_1.default.Component {
     /** Ordinal of update (0, 1, 2...) to ensure using latest */
     updateSeq;
+    /** Abort controller for the current data load */
+    abortController;
     constructor(props) {
         super(props);
         this.updateSeq = 0;
@@ -31,7 +33,8 @@ class ChartViewComponent extends react_1.default.Component {
     componentDidUpdate(prevProps) {
         if (!lodash_1.default.isEqual(prevProps.design, this.props.design) ||
             !lodash_1.default.isEqual(prevProps.filters, this.props.filters) ||
-            this.props.dataSource.getCacheExpiry() !== this.state.cacheExpiry) {
+            this.props.dataSource.getCacheExpiry() !== this.state.cacheExpiry ||
+            prevProps.refreshKey !== this.props.refreshKey) {
             // Save new cache expiry
             this.setState({ cacheExpiry: this.props.dataSource.getCacheExpiry() });
             this.updateData();
@@ -46,20 +49,25 @@ class ChartViewComponent extends react_1.default.Component {
             return;
         }
         this.updateSeq += 1;
+        if (this.abortController) {
+            this.abortController.abort("Aborting previous data load");
+        }
         // Set loading data after interval to prevent unnecessary refresh
         const dataLoadingTimeout = setTimeout(() => {
             this.setState({ dataLoading: true });
         }, 100);
         // Store updateSeq to check if latest
         const loadingUpdateSeq = this.updateSeq;
-        this.props.widgetDataSource.getData(design, this.props.filters || [], (error, data) => {
+        this.abortController = this.props.widgetDataSource.getData(design, this.props.filters || [], (error, data) => {
             // Prevent setting data loading if ready
             clearTimeout(dataLoadingTimeout);
             // Only update if latest
             if (loadingUpdateSeq == this.updateSeq) {
+                // Clear the abort controller
+                this.abortController = undefined;
                 this.setState({ dataLoading: false, dataError: error, data, validDesign: design });
             }
-        });
+        }) ?? undefined;
     }
     renderSpinner() {
         return R("div", { style: { position: "absolute", bottom: "50%", left: 0, right: 0, textAlign: "center", fontSize: 20 } }, R("i", { className: "fa fa-spinner fa-spin" }));

package/lib/widgets/charts/ChartWidget.d.ts

@@ -1,13 +1,8 @@
-import PropTypes from "prop-types";
 import React from "react";
 import Widget, { CreateViewElementOptions } from "./../Widget";
-import ActionCancelModalComponent from "@mwater/react-library/lib/ActionCancelModalComponent";
-import ChartViewComponent from "./ChartViewComponent";
-import ModalWindowComponent from "@mwater/react-library/lib/ModalWindowComponent";
 import { DataSource, Schema } from "@mwater/expressions";
-import { WidgetDataSource } from "../WidgetDataSource";
 import Chart from "./Chart";
-import { JsonQLFilter } from "../../JsonQLFilter";
+import { ChartWidgetComponent } from "./ChartWidgetComponent";
 /** A widget which is a chart */
 export default class ChartWidget extends Widget {
     chart: Chart;
@@ -17,59 +12,3 @@ export default class ChartWidget extends Widget {
     getFilterableTables(design: any, schema: Schema): string[];
     isAutoHeight(): boolean;
 }
-interface ChartWidgetComponentProps {
-    /** schema to use */
-    schema: Schema;
-    /** data source to use */
-    dataSource: DataSource;
-    widgetDataSource: WidgetDataSource;
-    /** Chart object to use */
-    chart: Chart;
-    /** Design of chart */
-    design: any;
-    /** null/undefined for readonly */
-    onDesignChange?: any;
-    /** Width in pixels */
-    width: number;
-    /** Height, if a fixed height widget, or one that uses aspect ratio */
-    height?: number;
-    /** scope of the widget (when the widget self-selects a particular scope) */
-    scope?: any;
-    /** array of filters to apply. Each is { table: table id, jsonql: jsonql condition with {alias} for tableAlias. Use injectAlias to correct */
-    filters: JsonQLFilter[];
-    /** called with (scope) as a scope to apply to self and filter to apply to other widgets. See WidgetScoper for details */
-    onScopeChange?: any;
-    /** Called with (tableId, rowId) when item is clicked */
-    onRowClick?: any;
-    /** Connects move handle for dragging (see WidgetContainerComponent) TODO REMOVE */
-    connectMoveHandle?: any;
-    /** Connects resize handle for dragging (see WidgetContainerComponent) TODO REMOVE */
-    connectResizeHandle?: any;
-}
-declare class ChartWidgetComponent extends React.PureComponent<ChartWidgetComponentProps, {
-    editDesign: any;
-}> {
-    static contextTypes: {
-        locale: PropTypes.Requireable<string>;
-    };
-    constructor(props: any);
-    handleSaveCsvFile: () => void;
-    handleStartEditing: () => void;
-    handleEndEditing: () => void;
-    handleCancelEditing: () => void;
-    handleEditDesignChange: (design: any) => void;
-    renderChart(design: any, onDesignChange: any, width: any, height: any): React.CElement<import("./ChartViewComponent").ChartViewComponentProps, ChartViewComponent>;
-    renderEditor(): React.CElement<import("@mwater/react-library/lib/ModalWindowComponent").ModalWindowComponentProps, ModalWindowComponent> | React.CElement<import("@mwater/react-library/lib/ActionCancelModalComponent").ActionCancelModalComponentProps, ActionCancelModalComponent> | null;
-    renderEditLink(): React.DetailedReactHTMLElement<{
-        className: string;
-        onClick: () => void;
-    }, HTMLElement>;
-    render(): React.DetailedReactHTMLElement<{
-        onDoubleClick: (() => void) | undefined;
-        style: {
-            position: "relative";
-            width: number;
-        };
-    }, HTMLElement>;
-}
-export {};