@uiw/react-amap-map
Advanced tools
Comparing version 2.2.1 to 2.2.2
@@ -5,3 +5,5 @@ "use strict"; | ||
exports.__esModule = true; | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
var _exportNames = { | ||
@@ -12,5 +14,5 @@ Map: true | ||
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")); | ||
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2")); | ||
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose")); | ||
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties")); | ||
@@ -25,3 +27,8 @@ var _react = require("react"); | ||
if (key in exports && exports[key] === _useMap2[key]) return; | ||
exports[key] = _useMap2[key]; | ||
Object.defineProperty(exports, key, { | ||
enumerable: true, | ||
get: function get() { | ||
return _useMap2[key]; | ||
} | ||
}); | ||
}); | ||
@@ -36,6 +43,6 @@ | ||
children = _ref.children, | ||
props = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded); | ||
props = (0, _objectWithoutProperties2["default"])(_ref, _excluded); | ||
var elmRef = (0, _react.useRef)(null); | ||
var _useMap = (0, _useMap2.useMap)((0, _extends2["default"])({ | ||
var _useMap = (0, _useMap2.useMap)((0, _objectSpread2["default"])({ | ||
container: elmRef.current | ||
@@ -51,3 +58,3 @@ }, props)), | ||
(0, _react.useImperativeHandle)(ref, function () { | ||
return (0, _extends2["default"])({}, props, { | ||
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, props), {}, { | ||
map: map, | ||
@@ -65,3 +72,3 @@ AMap: AMap, | ||
className: className, | ||
style: (0, _extends2["default"])({ | ||
style: (0, _objectSpread2["default"])({ | ||
fontSize: 1, | ||
@@ -91,3 +98,3 @@ height: '100%' | ||
return /*#__PURE__*/(0, _react.cloneElement)(child, (0, _extends2["default"])({}, child.props, { | ||
return /*#__PURE__*/(0, _react.cloneElement)(child, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, child.props), {}, { | ||
AMap: AMap, | ||
@@ -94,0 +101,0 @@ map: map, |
@@ -5,5 +5,11 @@ "use strict"; | ||
exports.__esModule = true; | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
exports.useMap = void 0; | ||
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2")); | ||
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray")); | ||
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")); | ||
@@ -15,21 +21,20 @@ | ||
var useMap = function useMap(props) { | ||
if (props === void 0) { | ||
props = {}; | ||
} | ||
var useMap = function useMap() { | ||
var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; | ||
var other = (0, _extends2["default"])({}, props); | ||
var _props = props, | ||
other = (0, _extends2["default"])({}, _props); | ||
var _useState = (0, _react.useState)(), | ||
map = _useState[0], | ||
setMap = _useState[1]; | ||
_useState2 = (0, _slicedToArray2["default"])(_useState, 2), | ||
map = _useState2[0], | ||
setMap = _useState2[1]; | ||
var _useState2 = (0, _react.useState)(props.zoom || 15), | ||
zoom = _useState2[0], | ||
setZoom = _useState2[1]; | ||
var _useState3 = (0, _react.useState)(props.zoom || 15), | ||
_useState4 = (0, _slicedToArray2["default"])(_useState3, 2), | ||
zoom = _useState4[0], | ||
setZoom = _useState4[1]; | ||
var _useState3 = (0, _react.useState)(props.container), | ||
container = _useState3[0], | ||
setContainer = _useState3[1]; | ||
var _useState5 = (0, _react.useState)(props.container), | ||
_useState6 = (0, _slicedToArray2["default"])(_useState5, 2), | ||
container = _useState6[0], | ||
setContainer = _useState6[1]; | ||
@@ -40,3 +45,3 @@ (0, _react.useEffect)(function () { | ||
if (container && !map && AMap) { | ||
instance = new AMap.Map(container, (0, _extends2["default"])({ | ||
instance = new AMap.Map(container, (0, _objectSpread2["default"])({ | ||
zoom: zoom | ||
@@ -43,0 +48,0 @@ }, other)); |
121
esm/index.js
@@ -1,41 +0,65 @@ | ||
import _extends from "@babel/runtime/helpers/esm/extends"; | ||
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose"; | ||
var _excluded = ["className", "style", "children"]; | ||
/// <reference types="@uiw/react-amap-types" /> | ||
import { useRef, useEffect, useImperativeHandle, Fragment, Children, cloneElement, isValidElement, forwardRef } from 'react'; | ||
import { useMap } from './useMap'; | ||
import { jsx as _jsx } from "react/jsx-runtime"; | ||
import { jsxs as _jsxs } from "react/jsx-runtime"; | ||
export * from './useMap'; | ||
export var Map = /*#__PURE__*/forwardRef(function (_ref, ref) { | ||
var className = _ref.className, | ||
style = _ref.style, | ||
children = _ref.children, | ||
props = _objectWithoutPropertiesLoose(_ref, _excluded); | ||
"use strict"; | ||
var elmRef = useRef(null); | ||
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; | ||
var _useMap = useMap(_extends({ | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
var _exportNames = { | ||
Map: true | ||
}; | ||
exports.Map = void 0; | ||
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")); | ||
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose")); | ||
var _react = require("react"); | ||
var _useMap = require("./useMap"); | ||
Object.keys(_useMap).forEach(function (key) { | ||
if (key === "default" || key === "__esModule") return; | ||
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return; | ||
if (key in exports && exports[key] === _useMap[key]) return; | ||
Object.defineProperty(exports, key, { | ||
enumerable: true, | ||
get: function get() { | ||
return _useMap[key]; | ||
} | ||
}); | ||
}); | ||
var _jsxRuntime = require("react/jsx-runtime"); | ||
var _excluded = ["className", "style", "children"]; | ||
var Map = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => { | ||
var { | ||
className, | ||
style, | ||
children | ||
} = _ref, | ||
props = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded); | ||
var elmRef = (0, _react.useRef)(null); | ||
var { | ||
setContainer, | ||
container, | ||
map | ||
} = (0, _useMap.useMap)((0, _extends2.default)({ | ||
container: elmRef.current | ||
}, props)), | ||
setContainer = _useMap.setContainer, | ||
container = _useMap.container, | ||
map = _useMap.map; | ||
}, props)); | ||
(0, _react.useEffect)(() => setContainer(elmRef.current), [elmRef.current]); | ||
(0, _react.useImperativeHandle)(ref, () => (0, _extends2.default)({}, props, { | ||
map, | ||
AMap, | ||
container: elmRef.current | ||
}), [map]); | ||
useEffect(function () { | ||
return setContainer(elmRef.current); | ||
}, [elmRef.current]); | ||
useImperativeHandle(ref, function () { | ||
return _extends({}, props, { | ||
map: map, | ||
AMap: AMap, | ||
container: elmRef.current | ||
}); | ||
}, [map]); | ||
var childs = Children.toArray(children); | ||
return /*#__PURE__*/_jsxs(Fragment, { | ||
children: [/*#__PURE__*/_jsx("div", { | ||
var childs = _react.Children.toArray(children); | ||
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_react.Fragment, { | ||
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", { | ||
ref: elmRef, | ||
className: className, | ||
style: _extends({ | ||
style: (0, _extends2.default)({ | ||
fontSize: 1, | ||
@@ -45,27 +69,27 @@ height: '100%' | ||
}), AMap && map && typeof children === 'function' && children({ | ||
AMap: AMap, | ||
map: map, | ||
container: container | ||
}), AMap && map && childs.map(function (child, key) { | ||
AMap, | ||
map, | ||
container | ||
}), AMap && map && childs.map((child, key) => { | ||
if (typeof child === 'string') { | ||
return /*#__PURE__*/cloneElement( /*#__PURE__*/_jsx(Fragment, { | ||
return /*#__PURE__*/(0, _react.cloneElement)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, { | ||
children: child | ||
}), { | ||
key: key | ||
key | ||
}); | ||
} | ||
if (! /*#__PURE__*/isValidElement(child)) return null; | ||
if (! /*#__PURE__*/(0, _react.isValidElement)(child)) return null; | ||
if (child.type && typeof child.type === 'string') { | ||
return /*#__PURE__*/cloneElement(child, { | ||
key: key | ||
return /*#__PURE__*/(0, _react.cloneElement)(child, { | ||
key | ||
}); | ||
} | ||
return /*#__PURE__*/cloneElement(child, _extends({}, child.props, { | ||
AMap: AMap, | ||
map: map, | ||
container: container, | ||
key: key | ||
return /*#__PURE__*/(0, _react.cloneElement)(child, (0, _extends2.default)({}, child.props, { | ||
AMap, | ||
map, | ||
container, | ||
key | ||
})); | ||
@@ -75,2 +99,3 @@ })] | ||
}); | ||
exports.Map = Map; | ||
//# sourceMappingURL=index.js.map |
@@ -1,30 +0,31 @@ | ||
import _extends from "@babel/runtime/helpers/esm/extends"; | ||
import { useState, useMemo, useEffect } from 'react'; | ||
import { useSetStatus, useEventProperties, useSettingProperties } from '@uiw/react-amap-utils'; | ||
export var useMap = function useMap(props) { | ||
if (props === void 0) { | ||
props = {}; | ||
} | ||
"use strict"; | ||
var _props = props, | ||
other = _extends({}, _props); | ||
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; | ||
var _useState = useState(), | ||
map = _useState[0], | ||
setMap = _useState[1]; | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
exports.useMap = void 0; | ||
var _useState2 = useState(props.zoom || 15), | ||
zoom = _useState2[0], | ||
setZoom = _useState2[1]; | ||
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")); | ||
var _useState3 = useState(props.container), | ||
container = _useState3[0], | ||
setContainer = _useState3[1]; | ||
var _react = require("react"); | ||
useEffect(function () { | ||
var _reactAmapUtils = require("@uiw/react-amap-utils"); | ||
var useMap = function useMap(props) { | ||
if (props === void 0) { | ||
props = {}; | ||
} | ||
var other = (0, _extends2.default)({}, props); | ||
var [map, setMap] = (0, _react.useState)(); | ||
var [zoom, setZoom] = (0, _react.useState)(props.zoom || 15); | ||
var [container, setContainer] = (0, _react.useState)(props.container); | ||
(0, _react.useEffect)(() => { | ||
var instance; | ||
if (container && !map && AMap) { | ||
instance = new AMap.Map(container, _extends({ | ||
zoom: zoom | ||
instance = new AMap.Map(container, (0, _extends2.default)({ | ||
zoom | ||
}, other)); | ||
@@ -34,3 +35,3 @@ setMap(instance); | ||
return function () { | ||
return () => { | ||
if (instance) { | ||
@@ -41,3 +42,3 @@ setMap(undefined); // instance.destroy(); | ||
}, [container]); | ||
useMemo(function () { | ||
(0, _react.useMemo)(() => { | ||
if (map && typeof props.zoom === 'number' && zoom !== props.zoom && props.zoom >= 2 && props.zoom <= 20) { | ||
@@ -48,13 +49,15 @@ setZoom(props.zoom); | ||
}, [zoom, props.zoom]); | ||
useSetStatus(map, props, ['dragEnable', 'zoomEnable', 'jogEnable', 'pitchEnable', 'rotateEnable', 'animateEnable', 'keyboardEnable']); // setStatus, setZoomAndCenter, setFitView | ||
(0, _reactAmapUtils.useSetStatus)(map, props, ['dragEnable', 'zoomEnable', 'jogEnable', 'pitchEnable', 'rotateEnable', 'animateEnable', 'keyboardEnable']); // setStatus, setZoomAndCenter, setFitView | ||
useSettingProperties(map, props, ['Zoom', 'LabelzIndex', 'Layers', 'Center', 'City', 'Bounds', 'LimitBounds', 'Lang', 'Rotation', 'DefaultCursor', 'MapStyle', 'Features', 'DefaultLayer', 'Pitch']); | ||
useEventProperties(map, props, ['onMouseMove', 'onZoomChange', 'onMapMove', 'onMouseWheel', 'onZoomStart', 'onMouseOver', 'onMouseOut', 'onDblClick', 'onClick', 'onZoomEnd', 'onMoveEnd', 'onMouseUp', 'onMouseDown', 'onRightClick', 'onMoveStart', 'onDragStart', 'onDragging', 'onDragEnd', 'onHotspotOut', 'onHotspotOver', 'onTouchStart', 'onComplete', 'onHotspotClick', 'onTouchMove', 'onTouchEnd', 'onResize']); | ||
(0, _reactAmapUtils.useSettingProperties)(map, props, ['Zoom', 'LabelzIndex', 'Layers', 'Center', 'City', 'Bounds', 'LimitBounds', 'Lang', 'Rotation', 'DefaultCursor', 'MapStyle', 'Features', 'DefaultLayer', 'Pitch']); | ||
(0, _reactAmapUtils.useEventProperties)(map, props, ['onMouseMove', 'onZoomChange', 'onMapMove', 'onMouseWheel', 'onZoomStart', 'onMouseOver', 'onMouseOut', 'onDblClick', 'onClick', 'onZoomEnd', 'onMoveEnd', 'onMouseUp', 'onMouseDown', 'onRightClick', 'onMoveStart', 'onDragStart', 'onDragging', 'onDragEnd', 'onHotspotOut', 'onHotspotOver', 'onTouchStart', 'onComplete', 'onHotspotClick', 'onTouchMove', 'onTouchEnd', 'onResize']); | ||
return { | ||
map: map, | ||
setMap: setMap, | ||
container: container, | ||
setContainer: setContainer | ||
map, | ||
setMap, | ||
container, | ||
setContainer | ||
}; | ||
}; | ||
exports.useMap = useMap; | ||
//# sourceMappingURL=useMap.js.map |
{ | ||
"name": "@uiw/react-amap-map", | ||
"version": "2.2.1", | ||
"version": "2.2.2", | ||
"description": "基于 React 封装的高德地图组件。AMap Component Based On React.", | ||
@@ -34,9 +34,9 @@ "homepage": "https://uiwjs.github.io/react-amap/#/map", | ||
"dependencies": { | ||
"@uiw/react-amap-types": "^2.2.1", | ||
"@uiw/react-amap-utils": "^2.2.1" | ||
"@uiw/react-amap-types": "^2.2.2", | ||
"@uiw/react-amap-utils": "^2.2.2" | ||
}, | ||
"devDependencies": { | ||
"@types/react": "17.0.19", | ||
"@types/react": "17.0.20", | ||
"@types/react-dom": "17.0.9" | ||
} | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
46057
548
Updated@uiw/react-amap-types@^2.2.2
Updated@uiw/react-amap-utils@^2.2.2