@mapcomponents/react-maplibre 0.1.63 → 0.1.64

package/dist/setupTests.d.ts

@@ -1,10 +1,11 @@
 export var uuid_regex: string;
 export namespace mockMapLibreMethods {
-    const on: any;
-    const off: any;
-    const addControl: any;
-    const removeControl: any;
-    const hasControl: any;
+    const on: jest.Mock<any, any>;
+    const off: jest.Mock<any, any>;
+    const addControl: jest.Mock<any, any>;
+    const removeControl: jest.Mock<any, any>;
+    const fitBounds: jest.Mock<any, any>;
+    const hasControl: jest.Mock<boolean, []>;
     function getCanvas(): HTMLCanvasElement;
     function getContainer(): {
         style: {};

package/dist/ui_components/Dropzone.d.ts

@@ -0,0 +1,5 @@
+type Props = {
+    setData: (data: string) => void;
+};
+export default function Dropzone(props: Props): JSX.Element;
+export {};

package/dist/ui_components/ImageLoader.d.ts

@@ -1,2 +1,9 @@
+import { SxProps } from '@mui/material';
+interface ImageLoaderProps {
+    src: string;
+    alt?: string;
+    sx?: SxProps;
+    className?: string;
+}
+declare const ImageLoader: (props: ImageLoaderProps) => JSX.Element;
 export default ImageLoader;
-declare function ImageLoader(props: any): JSX.Element;

package/dist/ui_components/LoadingOverlayContext.d.ts

@@ -1,11 +1,11 @@
-export const LoadingOverlayContext: React.Context<{}>;
-export function LoadingOverlayProvider({ children }: {
-    children: any;
-}): JSX.Element;
-export namespace LoadingOverlayProvider {
-    namespace propTypes {
-        const children: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
-    }
-}
-import React from "react";
-import PropTypes from "prop-types";
+import React from 'react';
+import PropTypes from 'prop-types';
+import { JsxChildren } from 'typedoc/dist/lib/utils/jsx.elements';
+declare const LoadingOverlayContext: React.Context<{}>;
+declare const LoadingOverlayProvider: {
+    (children: JsxChildren): JSX.Element;
+    propTypes: {
+        children: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
+    };
+};
+export { LoadingOverlayContext, LoadingOverlayProvider };

package/dist/ui_components/Sidebar.d.ts

@@ -1,9 +1,10 @@
-import { PaperProps } from '@mui/material';
-import { JsxChildren } from 'typedoc/dist/lib/utils/jsx.elements';
+import React from 'react';
+import { PaperProps, SxProps, DrawerProps } from '@mui/material';
 interface SidebarProps {
-    drawerPaperProps: PaperProps;
-    drawerHeaderProps: Headers;
-    children: JsxChildren;
+    drawerPaperProps?: PaperProps;
+    drawerHeaderProps?: Headers;
+    drawerButtonStyle?: SxProps | undefined;
+    children?: React.ReactNode;
 }
-export default function Sidebar({ drawerPaperProps, drawerHeaderProps, ...props }: SidebarProps): JSX.Element;
+export default function Sidebar({ drawerPaperProps, drawerHeaderProps, drawerButtonStyle, ...props }: SidebarProps & DrawerProps): JSX.Element;
 export {};

package/dist/ui_components/Tooltip.d.ts

@@ -1 +1 @@
-export default function Legend(props: any): JSX.Element;
+export default function Legend(): JSX.Element;

package/dist/ui_components/TopToolbar.d.ts

@@ -1,6 +1,7 @@
-import { AppBarProps, ToolbarProps } from '@mui/material';
+import { AppBarProps, ToolbarProps, SxProps } from '@mui/material';
 interface TopToolbarProps extends AppBarProps {
-    toolbarProps: ToolbarProps;
+    toolbarProps?: ToolbarProps;
+    appBarStyle?: SxProps;
 }
-export default function TopToolbar({ toolbarProps, ...props }: TopToolbarProps): JSX.Element;
+export default function TopToolbar({ toolbarProps, appBarStyle, ...props }: TopToolbarProps): JSX.Element;
 export {};

package/dist/ui_components/UploadButton.d.ts

@@ -0,0 +1,6 @@
+type Props = {
+    setData: (data: string) => void;
+    buttonComponent: any;
+};
+export default function UploadButton(props: Props): JSX.Element;
+export {};

package/dist/util/BubbleForInstructions.d.ts

@@ -0,0 +1,2 @@
+export default BubbleForInstruction;
+declare function BubbleForInstruction(props: any): JSX.Element;

package/dist/util/Instructions.d.ts

@@ -0,0 +1,13 @@
+import { SxProps } from '@mui/material';
+interface StepObject {
+    duration: number;
+    props: SxProps;
+    content: JSX.Element;
+}
+interface InstructionProps {
+    steps: Array<StepObject>;
+    open: boolean;
+    callback?: () => void;
+}
+declare const Instructions: (props: InstructionProps) => JSX.Element;
+export default Instructions;

package/package.json

@@ -1,193 +1,197 @@
 {
-  "name": "@mapcomponents/react-maplibre",
-  "version": "0.1.63",
-  "main": "index.js",
-  "license": "MIT",
-  "module": "dist/index.esm.js",
-  "source": "src/index.ts",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "rollup -c",
-    "start": "start-storybook -p 6006 -s public",
-    "cypress-test": "npx cypress run --component",
-    "test": "node scripts/test.js --env=jest-environment-jsdom-sixteen --watchAll=false --coverage",
-    "test:noninteractive": "node scripts/test.js --env=jest-environment-jsdom-sixteen --verbose --watchAll=false --coverage",
-    "test:generate-output": "node scripts/test.js --env=jest-environment-jsdom-sixteen --watchAll=false --json --outputFile=./src/.jest-test-results.json || true",
-    "build-storybook": "build-storybook -o docs-build -s public",
-    "storybook-docs": "start-storybook --docs --no-manager-cache",
-    "build-catalogue-meta": "node scripts/build-catalogue-meta.js",
-    "build-catalogue-markdown-docs": "node scripts/build-catalogue-markdown-docs.js",
-    "create-component": "./scripts/create-map-component.sh"
-  },
-  "dependencies": {
-    "@emotion/css": "11.10.5",
-    "@emotion/react": "11.10.5",
-    "@emotion/styled": "11.10.5",
-    "@mapbox/mapbox-gl-draw": "^1.3.0",
-    "@mapbox/mapbox-gl-sync-move": "0.3.0",
-    "@mui/icons-material": "5.11.0",
-    "@mui/material": "5.11.0",
-    "@mui/styles": "5.11.0",
-    "@turf/turf": "^6.5.0",
-    "d3": "^7.7.0",
-    "jspdf": "^2.5.1",
-    "maplibre-gl": "^2.4.0",
-    "mui-color": "^2.0.0-beta.2",
-    "react-draggable": "^4.4.5",
-    "react-i18next": "^11.14.3",
-    "react-moveable": "^0.41.1",
-    "three": "^0.147.0",
-    "uuid": "^9.0.0",
-    "wms-capabilities": "^0.6.0",
-    "xmldom": "^0.6.0"
-  },
-  "peerDependencies": {},
-  "devDependencies": {
-    "@babel/preset-react": "^7.16.7",
-    "@bahmutov/cy-rollup": "^2.0.0",
-    "@cypress/react": "^6.2.0",
-    "@cypress/webpack-preprocessor": "^5.14.0",
-    "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^21.0.3",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "@rollup/plugin-url": "^6.1.0",
-    "@storybook/addon-actions": "^6.4.19",
-    "@storybook/addon-docs": "^6.4.20",
-    "@storybook/addon-essentials": "^6.4.19",
-    "@storybook/addon-links": "^6.4.19",
-    "@storybook/addons": "^6.4.19",
-    "@storybook/node-logger": "^6.4.19",
-    "@storybook/react": "^6.4.19",
-    "@storybook/testing-react": "^1.3.0",
-    "@storybook/theming": "^6.4.19",
-    "@svgr/rollup": "^6.2.1",
-    "@testing-library/react": "^12.1.2",
-    "@types/enzyme": "^3.10.11",
-    "@types/mapbox__mapbox-gl-draw": "^1.2.3",
-    "@types/mapbox__point-geometry": "^0.1.2",
-    "@types/mapbox__vector-tile": "^1.3.0",
-    "@types/react": "^17.0.43",
-    "@types/react-dom": "^17.0.14",
-    "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.36.1",
-    "@typescript-eslint/parser": "^5.36.1",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
-    "babel-jest": "^26.6.0",
-    "babel-plugin-inline-react-svg": "^2.0.1",
-    "babel-plugin-styled-components": "^2.0.6",
-    "babel-preset-react-app": "^10.0.1",
-    "cypress": "^10.9.0",
-    "enzyme": "^3.11.0",
-    "eslint": "^8.23.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-react": "^7.31.1",
-    "glob": "^7.2.0",
-    "jest": "26.6.0",
-    "jest-circus": "26.6.0",
-    "jest-environment-jsdom-sixteen": "^2.0.0",
-    "jest-enzyme": "^7.1.2",
-    "jest-resolve": "26.6.0",
-    "jest-watch-typeahead": "0.6.1",
-    "postcss": "^8.4.12",
-    "prettier": "2.7.1",
-    "react": "^17.0.2",
-    "react-app-polyfill": "^3.0.0",
-    "react-dev-utils": "^12.0.0",
-    "react-dom": "^17.0.2",
-    "rollup": "^2.70.1",
-    "rollup-plugin-delete": "^2.0.0",
-    "rollup-plugin-import-css": "^3.0.3",
-    "rollup-plugin-peer-deps-external": "^2.2.4",
-    "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-typescript2": "^0.31.2",
-    "showdown": "^2.0.3",
-    "ts-jest": "^27.1.4",
-    "typedoc": "^0.22.13",
-    "typedoc-plugin-missing-exports": "^0.22.6",
-    "typedoc-twilio-theme": "^1.0.1",
-    "typescript": "^4.6.3"
-  },
-  "jest": {
-    "roots": [
-      "<rootDir>/src"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.{js,jsx,ts,tsx}",
-      "!src/**/*.d.ts"
-    ],
-    "setupFiles": [
-      "react-app-polyfill/jsdom"
-    ],
-    "setupFilesAfterEnv": [
-      "<rootDir>/src/setupTests.js"
-    ],
-    "testMatch": [
-      "<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
-      "<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
-    ],
-    "testEnvironment": "jsdom",
-    "testRunner": "./node_modules/jest-circus/runner.js",
-    "transform": {
-      "^.+\\.(js|jsx|mjs|cjs|ts|tsx)$": "<rootDir>/config/jest/babelTransform.js",
-      "^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
-      "^(?!.*\\.(js|jsx|mjs|cjs|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
-    },
-    "transformIgnorePatterns": [
-      "[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|cjs|ts|tsx)$",
-      "^.+\\.module\\.(css|sass|scss)$"
-    ],
-    "modulePaths": [],
-    "moduleNameMapper": {
-      "^react-native$": "react-native-web",
-      "^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy",
-      "^!maplibre-gl$": "<rootDir>/node_modules/maplibre-gl",
-      "d3": "<rootDir>/node_modules/d3/dist/d3.min.js"
-    },
-    "moduleFileExtensions": [
-      "web.js",
-      "js",
-      "web.ts",
-      "ts",
-      "web.tsx",
-      "tsx",
-      "json",
-      "web.jsx",
-      "jsx",
-      "node"
-    ],
-    "watchPlugins": [
-      "jest-watch-typeahead/filename",
-      "jest-watch-typeahead/testname"
-    ],
-    "resetMocks": true,
-    "coveragePathIgnorePatterns": [
-      "/node_modules/",
-      "/src/decorators/",
-      "/src/lab/",
-      "/src/stories/",
-      "/src/ui_components/",
-      "/src/deckgl_components/",
-      "/src/components/MlBasicComponent",
-      "/src/components/MlMapDrawTools",
-      "/src/components/MlComponentTemplate/",
-      "/src/components/MlAerialPhotograph/",
-      "/src/components/MapLibreMapDebug/",
-      "/src/components/MlDemoDashboard/",
-      "/src/components/MlLaufwettbewerbApp/",
-      "/src/components/MlLaermkarte/",
-      "/src/components/MlMobilerImker/",
-      "/src/components/MlWanderApp/",
-      "(.test)\\.(ts|tsx|js)$",
-      "index\\.js$",
-      ".*/lib/.*",
-      ".*/utils/.*",
-      ".*/util/.*",
-      ".*/assets/.*",
-      ".*/custom.d.tsx",
-      "custom\\-.*\\-mode\\.js$",
-      "(.stories)\\.(ts|tsx|js)$",
-      "/distribution/.*\\.(ts|js)$"
-    ]
-  }
+	"name": "@mapcomponents/react-maplibre",
+	"version": "0.1.64",
+	"main": "index.js",
+	"license": "MIT",
+	"module": "dist/index.esm.js",
+	"source": "src/index.ts",
+	"types": "dist/index.d.ts",
+	"scripts": {
+		"build": "rollup -c",
+		"start": "start-storybook -p 6006 -s public",
+		"cypress-test": "npx cypress run --component",
+		"test": "node scripts/test.js --env=jest-environment-jsdom-sixteen --watchAll=false --coverage",
+		"test:noninteractive": "node scripts/test.js --env=jest-environment-jsdom-sixteen --verbose --watchAll=false --coverage",
+		"test:generate-output": "node scripts/test.js --env=jest-environment-jsdom-sixteen --watchAll=false --json --outputFile=./src/.jest-test-results.json || true",
+		"build-storybook": "build-storybook -o docs-build -s public",
+		"storybook-docs": "start-storybook --docs --no-manager-cache",
+		"build-catalogue-meta": "node scripts/build-catalogue-meta.js",
+		"build-catalogue-markdown-docs": "node scripts/build-catalogue-markdown-docs.js",
+		"create-component": "./scripts/create-map-component.sh"
+	},
+	"dependencies": {
+		"@emotion/css": "11.10.5",
+		"@emotion/react": "11.10.5",
+		"@emotion/styled": "11.10.5",
+		"@mapbox/mapbox-gl-draw": "^1.3.0",
+		"@mapbox/mapbox-gl-sync-move": "0.3.0",
+		"@mui/icons-material": "5.11.0",
+		"@mui/material": "5.11.0",
+		"@mui/styles": "5.11.0",
+		"@turf/turf": "^6.5.0",
+		"d3": "^7.7.0",
+		"jspdf": "^2.5.1",
+		"maplibre-gl": "^2.4.0",
+		"mui-color": "^2.0.0-beta.2",
+		"react-draggable": "^4.4.5",
+		"react-i18next": "^11.14.3",
+		"react-moveable": "^0.45.1",
+		"three": "^0.147.0",
+		"uuid": "^9.0.0",
+		"wms-capabilities": "^0.6.0",
+		"xmldom": "^0.6.0"
+	},
+	"peerDependencies": {},
+	"devDependencies": {
+		"@babel/preset-react": "^7.16.7",
+		"@bahmutov/cy-rollup": "^2.0.0",
+		"@cypress/react": "^6.2.0",
+		"@cypress/webpack-preprocessor": "^5.14.0",
+		"@rollup/plugin-alias": "^3.1.9",
+		"@rollup/plugin-babel": "^5.3.1",
+		"@rollup/plugin-commonjs": "^21.0.3",
+		"@rollup/plugin-node-resolve": "^13.1.3",
+		"@rollup/plugin-url": "^6.1.0",
+		"@storybook/addon-actions": "^6.4.19",
+		"@storybook/addon-docs": "^6.4.20",
+		"@storybook/addon-essentials": "^6.4.19",
+		"@storybook/addon-links": "^6.4.19",
+		"@storybook/addons": "^6.4.19",
+		"@storybook/node-logger": "^6.4.19",
+		"@storybook/react": "^6.4.19",
+		"@storybook/testing-react": "^1.3.0",
+		"@storybook/theming": "^6.4.19",
+		"@svgr/rollup": "^6.2.1",
+		"@testing-library/react": "^12.1.2",
+		"@types/enzyme": "^3.10.11",
+		"@types/expect": "^24.3.0",
+		"@types/jest": "^29.2.5",
+		"@types/mapbox__mapbox-gl-draw": "^1.2.3",
+		"@types/mapbox__point-geometry": "^0.1.2",
+		"@types/mapbox__vector-tile": "^1.3.0",
+		"@types/react": "^17.0.43",
+		"@types/react-dom": "^17.0.14",
+		"@types/uuid": "^8.3.4",
+		"@typescript-eslint/eslint-plugin": "^5.36.1",
+		"@typescript-eslint/parser": "^5.36.1",
+		"@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
+		"avj": "^0.0.0",
+		"babel-jest": "^26.6.0",
+		"babel-plugin-inline-react-svg": "^2.0.1",
+		"babel-plugin-styled-components": "^2.0.6",
+		"babel-preset-react-app": "^10.0.1",
+		"cypress": "^10.9.0",
+		"enzyme": "^3.11.0",
+		"eslint": "^8.23.0",
+		"eslint-config-prettier": "^8.5.0",
+		"eslint-plugin-react": "^7.31.1",
+		"glob": "^7.2.0",
+		"jest": "26.6.0",
+		"jest-circus": "26.6.0",
+		"jest-environment-jsdom-sixteen": "^2.0.0",
+		"jest-enzyme": "^7.1.2",
+		"jest-resolve": "26.6.0",
+		"jest-watch-typeahead": "0.6.1",
+		"node-fetch": "^3.3.0",
+		"postcss": "^8.4.12",
+		"prettier": "2.7.1",
+		"react": "^17.0.2",
+		"react-app-polyfill": "^3.0.0",
+		"react-dev-utils": "^12.0.0",
+		"react-dom": "^17.0.2",
+		"rollup": "^2.70.1",
+		"rollup-plugin-delete": "^2.0.0",
+		"rollup-plugin-import-css": "^3.0.3",
+		"rollup-plugin-peer-deps-external": "^2.2.4",
+		"rollup-plugin-postcss": "^4.0.2",
+		"rollup-plugin-typescript2": "^0.31.2",
+		"showdown": "^2.0.3",
+		"ts-jest": "^27.1.4",
+		"typedoc": "^0.22.13",
+		"typedoc-plugin-missing-exports": "^0.22.6",
+		"typedoc-twilio-theme": "^1.0.1",
+		"typescript": "^4.6.3"
+	},
+	"jest": {
+		"roots": [
+			"<rootDir>/src"
+		],
+		"collectCoverageFrom": [
+			"src/**/*.{js,jsx,ts,tsx}",
+			"!src/**/*.d.ts"
+		],
+		"setupFiles": [
+			"react-app-polyfill/jsdom"
+		],
+		"setupFilesAfterEnv": [
+			"<rootDir>/src/setupTests.js"
+		],
+		"testMatch": [
+			"<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
+			"<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
+		],
+		"testEnvironment": "jsdom",
+		"testRunner": "./node_modules/jest-circus/runner.js",
+		"transform": {
+			"^.+\\.(js|jsx|mjs|cjs|ts|tsx)$": "<rootDir>/config/jest/babelTransform.js",
+			"^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
+			"^(?!.*\\.(js|jsx|mjs|cjs|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
+		},
+		"transformIgnorePatterns": [
+			"[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|cjs|ts|tsx)$",
+			"^.+\\.module\\.(css|sass|scss)$"
+		],
+		"modulePaths": [],
+		"moduleNameMapper": {
+			"^react-native$": "react-native-web",
+			"^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy",
+			"^!maplibre-gl$": "<rootDir>/node_modules/maplibre-gl",
+			"d3": "<rootDir>/node_modules/d3/dist/d3.min.js"
+		},
+		"moduleFileExtensions": [
+			"web.js",
+			"js",
+			"web.ts",
+			"ts",
+			"web.tsx",
+			"tsx",
+			"json",
+			"web.jsx",
+			"jsx",
+			"node"
+		],
+		"watchPlugins": [
+			"jest-watch-typeahead/filename",
+			"jest-watch-typeahead/testname"
+		],
+		"resetMocks": true,
+		"coveragePathIgnorePatterns": [
+			"/node_modules/",
+			"/src/decorators/",
+			"/src/lab/",
+			"/src/stories/",
+			"/src/ui_components/",
+			"/src/deckgl_components/",
+			"/src/components/MlBasicComponent",
+			"/src/components/MlMapDrawTools",
+			"/src/components/MlComponentTemplate/",
+			"/src/components/MlAerialPhotograph/",
+			"/src/components/MapLibreMapDebug/",
+			"/src/components/MlDemoDashboard/",
+			"/src/components/MlLaufwettbewerbApp/",
+			"/src/components/MlLaermkarte/",
+			"/src/components/MlMobilerImker/",
+			"/src/components/MlWanderApp/",
+			"(.test)\\.(ts|tsx|js)$",
+			"index\\.js$",
+			".*/lib/.*",
+			".*/utils/.*",
+			".*/util/.*",
+			".*/assets/.*",
+			".*/custom.d.tsx",
+			"custom\\-.*\\-mode\\.js$",
+			"(.stories)\\.(ts|tsx|js)$",
+			"/distribution/.*\\.(ts|js)$"
+		]
+	}
 }

package/scripts/build-catalogue-meta.js

@@ -1,18 +1,42 @@
-const glob = require("glob");
-const fs = require("fs");
+const glob = require('glob');
+const fetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args));
+const Ajv = require('ajv');
+const ajv = new Ajv();
+const fs = require('fs');
 
 let options = {};
 let mc_meta = {};
 
-glob("src/**/**/*.meta.json", options, function (er, files) {
-  console.log(files);
+glob('src/**/**/*.meta.json', options, function (er, files) {
+	console.log(files);
 
-  for (var i = 0, len = files.length; i < len; i++) {
-    let rawdata = fs.readFileSync(files[i]);
-    let metaObj = JSON.parse(rawdata);
-    mc_meta[metaObj.name] = metaObj;
-  }
+	for (var i = 0, len = files.length; i < len; i++) {
+		let rawdata = fs.readFileSync(files[i]);
+		let metaObj = JSON.parse(rawdata);
+		mc_meta[metaObj.name] = metaObj;
+	}
 
-  let data = JSON.stringify(mc_meta);
-  fs.writeFileSync("public/catalogue/mc_meta.json", data);
+	fetch('https://catalogue.mapcomponents.org/schema/metadata.schema.json', {
+		method: 'GET',
+		headers: {
+			Accept: 'application/json',
+			'Content-Type': 'application/json',
+		},
+	})
+		.then((res) => {
+			if (!res.ok) {
+				return false;
+			} else {
+				return res.json();
+			}
+		})
+		.then((schema) => {
+			const validate = ajv.compile(schema);
+			const valid = validate(mc_meta);
+			if (!valid) throw new Error(JSON.stringify(validate.errors));
+			//if (!valid) console.log(validate.errors);
+
+			let data = JSON.stringify(mc_meta);
+			fs.writeFileSync('public/catalogue/mc_meta.json', data);
+		});
 });