@uiw/react-amap-map
Advanced tools
Comparing version 4.0.2 to 4.0.3
"use strict"; | ||
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"]; | ||
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"]; | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -12,7 +10,4 @@ value: true | ||
exports.useMapContext = useMapContext; | ||
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2")); | ||
var _react = _interopRequireWildcard(require("react")); | ||
var initialState = { | ||
@@ -24,9 +19,6 @@ map: undefined, | ||
exports.initialState = initialState; | ||
var reducer = function reducer(state, action) { | ||
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, state), action); | ||
}; | ||
exports.reducer = reducer; | ||
var Context = /*#__PURE__*/_react["default"].createContext({ | ||
@@ -38,10 +30,7 @@ state: initialState, | ||
}); | ||
exports.Context = Context; | ||
function useMapContext() { | ||
var _useContext = (0, _react.useContext)(Context), | ||
state = _useContext.state, | ||
dispatch = _useContext.dispatch; | ||
state = _useContext.state, | ||
dispatch = _useContext.dispatch; | ||
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, state), {}, { | ||
@@ -48,0 +37,0 @@ state: state, |
"use strict"; | ||
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"]; | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -13,13 +12,7 @@ value: true | ||
exports.Provider = exports.Map = void 0; | ||
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties")); | ||
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2")); | ||
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray")); | ||
var _react = require("react"); | ||
var _useMap2 = require("./useMap"); | ||
Object.keys(_useMap2).forEach(function (key) { | ||
@@ -36,5 +29,3 @@ if (key === "default" || key === "__esModule") return; | ||
}); | ||
var _context = require("./context"); | ||
Object.keys(_context).forEach(function (key) { | ||
@@ -51,13 +42,9 @@ if (key === "default" || key === "__esModule") return; | ||
}); | ||
var _jsxRuntime = require("react/jsx-runtime"); | ||
var _excluded = ["className", "children"]; | ||
var Provider = function Provider(props) { | ||
var _useReducer = (0, _react.useReducer)(_context.reducer, _context.initialState), | ||
_useReducer2 = (0, _slicedToArray2["default"])(_useReducer, 2), | ||
state = _useReducer2[0], | ||
dispatch = _useReducer2[1]; | ||
_useReducer2 = (0, _slicedToArray2["default"])(_useReducer, 2), | ||
state = _useReducer2[0], | ||
dispatch = _useReducer2[1]; | ||
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.Context.Provider, { | ||
@@ -71,23 +58,18 @@ value: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, state), {}, { | ||
}; | ||
exports.Provider = Provider; | ||
var Map = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) { | ||
var className = _ref.className, | ||
children = _ref.children, | ||
props = (0, _objectWithoutProperties2["default"])(_ref, _excluded); | ||
children = _ref.children, | ||
props = (0, _objectWithoutProperties2["default"])(_ref, _excluded); | ||
var _useReducer3 = (0, _react.useReducer)(_context.reducer, _context.initialState), | ||
_useReducer4 = (0, _slicedToArray2["default"])(_useReducer3, 2), | ||
state = _useReducer4[0], | ||
dispatch = _useReducer4[1]; | ||
_useReducer4 = (0, _slicedToArray2["default"])(_useReducer3, 2), | ||
state = _useReducer4[0], | ||
dispatch = _useReducer4[1]; | ||
var elmRef = (0, _react.useRef)(null); | ||
var _useMap = (0, _useMap2.useMap)((0, _objectSpread2["default"])({ | ||
container: props.container || elmRef.current | ||
}, props)), | ||
setContainer = _useMap.setContainer, | ||
container = _useMap.container, | ||
map = _useMap.map; | ||
container: props.container || elmRef.current | ||
}, props)), | ||
setContainer = _useMap.setContainer, | ||
container = _useMap.container, | ||
map = _useMap.map; | ||
(0, _react.useEffect)(function () { | ||
@@ -103,5 +85,3 @@ return setContainer(elmRef.current); | ||
}, [map]); | ||
var childs = _react.Children.toArray(children); | ||
(0, _react.useEffect)(function () { | ||
@@ -135,3 +115,2 @@ if (map) { | ||
if (! /*#__PURE__*/(0, _react.isValidElement)(child)) return null; | ||
if (typeof child === 'string') { | ||
@@ -144,3 +123,2 @@ return /*#__PURE__*/(0, _react.cloneElement)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, { | ||
} | ||
if (child.type && typeof child.type === 'string') { | ||
@@ -151,3 +129,2 @@ return /*#__PURE__*/(0, _react.cloneElement)(child, { | ||
} | ||
return /*#__PURE__*/(0, _react.cloneElement)(child, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, child.props), {}, { | ||
@@ -154,0 +131,0 @@ AMap: AMap, |
"use strict"; | ||
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"]; | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -9,37 +8,26 @@ value: true | ||
exports.useMap = void 0; | ||
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2")); | ||
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray")); | ||
var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/helpers/objectDestructuringEmpty")); | ||
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")); | ||
var _react = require("react"); | ||
var _reactAmapUtils = require("@uiw/react-amap-utils"); | ||
var _context = require("./context"); | ||
var useMap = function useMap() { | ||
var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; | ||
var other = (0, _extends2["default"])({}, props); | ||
var other = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(props), props)); | ||
var _useState = (0, _react.useState)(), | ||
_useState2 = (0, _slicedToArray2["default"])(_useState, 2), | ||
map = _useState2[0], | ||
setMap = _useState2[1]; | ||
_useState2 = (0, _slicedToArray2["default"])(_useState, 2), | ||
map = _useState2[0], | ||
setMap = _useState2[1]; | ||
var _useState3 = (0, _react.useState)(props.zoom || 15), | ||
_useState4 = (0, _slicedToArray2["default"])(_useState3, 2), | ||
zoom = _useState4[0], | ||
setZoom = _useState4[1]; | ||
_useState4 = (0, _slicedToArray2["default"])(_useState3, 2), | ||
zoom = _useState4[0], | ||
setZoom = _useState4[1]; | ||
var _useState5 = (0, _react.useState)(props.container), | ||
_useState6 = (0, _slicedToArray2["default"])(_useState5, 2), | ||
container = _useState6[0], | ||
setContainer = _useState6[1]; | ||
_useState6 = (0, _slicedToArray2["default"])(_useState5, 2), | ||
container = _useState6[0], | ||
setContainer = _useState6[1]; | ||
var _useContext = (0, _react.useContext)(_context.Context), | ||
dispatch = _useContext.dispatch; | ||
dispatch = _useContext.dispatch; | ||
(0, _react.useEffect)(function () { | ||
@@ -53,3 +41,2 @@ if (container && !map && AMap) { | ||
} | ||
return function () { | ||
@@ -73,3 +60,2 @@ if (map) { | ||
} | ||
return function () { | ||
@@ -94,5 +80,5 @@ dispatch({ | ||
}, [map, props.center]); | ||
(0, _reactAmapUtils.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 | ||
// 'Center', | ||
(0, _reactAmapUtils.useSettingProperties)(map, props, ['Zoom', 'LabelzIndex', 'Layers', 'City', 'Bounds', 'LimitBounds', 'Lang', 'Rotation', 'DefaultCursor', 'MapStyle', 'Features', 'DefaultLayer', 'Pitch']); | ||
@@ -109,4 +95,3 @@ (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']); | ||
}; | ||
exports.useMap = useMap; | ||
//# sourceMappingURL=useMap.js.map |
@@ -24,7 +24,6 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose"; | ||
var { | ||
className, | ||
children | ||
} = _ref, | ||
props = _objectWithoutPropertiesLoose(_ref, _excluded); | ||
className, | ||
children | ||
} = _ref, | ||
props = _objectWithoutPropertiesLoose(_ref, _excluded); | ||
var [state, dispatch] = useReducer(reducer, initialState); | ||
@@ -74,3 +73,2 @@ var elmRef = useRef(null); | ||
if (! /*#__PURE__*/isValidElement(child)) return null; | ||
if (typeof child === 'string') { | ||
@@ -83,3 +81,2 @@ return /*#__PURE__*/cloneElement( /*#__PURE__*/_jsx(Fragment, { | ||
} | ||
if (child.type && typeof child.type === 'string') { | ||
@@ -90,3 +87,2 @@ return /*#__PURE__*/cloneElement(child, { | ||
} | ||
return /*#__PURE__*/cloneElement(child, _extends({}, child.props, { | ||
@@ -93,0 +89,0 @@ AMap, |
@@ -0,1 +1,2 @@ | ||
import _objectDestructuringEmpty from "@babel/runtime/helpers/objectDestructuringEmpty"; | ||
import _extends from "@babel/runtime/helpers/extends"; | ||
@@ -9,5 +10,3 @@ import { useState, useMemo, useEffect, useContext } from 'react'; | ||
} | ||
var other = _extends({}, props); | ||
var other = _extends({}, (_objectDestructuringEmpty(props), props)); | ||
var [map, setMap] = useState(); | ||
@@ -27,3 +26,2 @@ var [zoom, setZoom] = useState(props.zoom || 15); | ||
} | ||
return () => { | ||
@@ -47,3 +45,2 @@ if (map) { | ||
} | ||
return () => { | ||
@@ -68,5 +65,5 @@ dispatch({ | ||
}, [map, props.center]); | ||
useSetStatus(map, props, ['dragEnable', 'zoomEnable', 'jogEnable', 'pitchEnable', 'rotateEnable', 'animateEnable', 'keyboardEnable']); // setStatus, setZoomAndCenter, setFitView | ||
useSetStatus(map, props, ['dragEnable', 'zoomEnable', 'jogEnable', 'pitchEnable', 'rotateEnable', 'animateEnable', 'keyboardEnable']); | ||
// setStatus, setZoomAndCenter, setFitView | ||
// 'Center', | ||
useSettingProperties(map, props, ['Zoom', 'LabelzIndex', 'Layers', 'City', 'Bounds', 'LimitBounds', 'Lang', 'Rotation', 'DefaultCursor', 'MapStyle', 'Features', 'DefaultLayer', 'Pitch']); | ||
@@ -73,0 +70,0 @@ 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']); |
{ | ||
"name": "@uiw/react-amap-map", | ||
"version": "4.0.2", | ||
"version": "4.0.3", | ||
"description": "基于 React 封装的高德地图组件。AMap Component Based On React.", | ||
@@ -34,4 +34,4 @@ "homepage": "https://uiwjs.github.io/react-amap/#/map", | ||
"dependencies": { | ||
"@uiw/react-amap-types": "4.0.2", | ||
"@uiw/react-amap-utils": "4.0.2" | ||
"@uiw/react-amap-types": "4.0.3", | ||
"@uiw/react-amap-utils": "4.0.3" | ||
}, | ||
@@ -38,0 +38,0 @@ "devDependencies": { |
@@ -165,3 +165,3 @@ Map 组件 | ||
return ( | ||
<div style={{ width: '100%', height: 330 }}> | ||
<div style={{ width: '100%', height: 130 }}> | ||
<Map | ||
@@ -185,5 +185,7 @@ layers={[new AMap.TileLayer.Satellite()]} | ||
const Mount = () => ( | ||
<div style={{ width: '100%', height: '300px' }}> | ||
<APILoader akay="a7a90e05a37d3f6bf76d4a9032fc9129"> | ||
<Demo /> | ||
</APILoader> | ||
</div> | ||
); | ||
@@ -190,0 +192,0 @@ |
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
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
897
341
70082
+ Added@uiw/react-amap-types@4.0.3(transitive)
+ Added@uiw/react-amap-utils@4.0.3(transitive)
- Removed@uiw/react-amap-types@4.0.2(transitive)
- Removed@uiw/react-amap-utils@4.0.2(transitive)
Updated@uiw/react-amap-types@4.0.3
Updated@uiw/react-amap-utils@4.0.3