Skip to content

Commit

Permalink
v5.0.12 released v5.0.12 (#329) 5ec8fa3
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaywcjlove
jaywcjlove committed Aug 30, 2023
1 parent cfbd0dc commit 1e4c0b0
Show file tree
Hide file tree
Showing 134 changed files with 259 additions and 255 deletions.
172 changes: 88 additions & 84 deletions amap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,10 @@ __webpack_require__.d(__webpack_exports__, {
MouseToolDrawType: () => (/* reexport */ MouseToolDrawType),
PolyEditor: () => (/* reexport */ PolyEditor),
Polygon: () => (/* reexport */ Polygon),
PolygonContext: () => (/* reexport */ PolygonContext),
PolygonEditor: () => (/* reexport */ PolygonEditor),
Polyline: () => (/* reexport */ Polyline),
PolylineContext: () => (/* reexport */ PolylineContext),
PolylineEditor: () => (/* reexport */ PolylineEditor),
Provider: () => (/* reexport */ Provider),
Rectangle: () => (/* reexport */ Rectangle),
Expand Down Expand Up @@ -1675,7 +1677,7 @@ var useLabelMarker = function useLabelMarker(props) {
// issue #259 兼容 v1.4.xxx 版本
if ((AMap == null || (_v2 = AMap.v) == null ? void 0 : _v2.indexOf('1.4')) === 0) {
var _labelMarkersLayer;
map == null || (_labelMarkersLayer = map.labelMarkersLayer) == null ? void 0 : _labelMarkersLayer.remove(labelMarker);
map == null || (_labelMarkersLayer = map.labelMarkersLayer) == null || _labelMarkersLayer.remove(labelMarker);
}
setLabelMarker(undefined);
}
Expand Down Expand Up @@ -1838,7 +1840,7 @@ var usePolygon = function usePolygon(props) {

setPolygon(undefined);
};
}, [map, polygon]);
}, [map]);
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
if (polygon) {
polygon.setOptions(other);
Expand All @@ -1857,6 +1859,8 @@ var usePolygon = function usePolygon(props) {




var PolygonContext = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createContext)(undefined);
var Polygon = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.forwardRef)((props, ref) => {
var {
children
Expand All @@ -1867,28 +1871,25 @@ var Polygon = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useImperativeHandle)(ref, () => _extends({}, props, {
polygon
}), [polygon]);
if (children && /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.isValidElement)(children) && polygon) {
var oProps = {
polygon,
polyElement: polygon
};
return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(children, _extends({}, props, oProps));
}
return null;
return /*#__PURE__*/(0,jsx_runtime.jsx)(PolygonContext.Provider, {
value: polygon,
children: children
});
});
;// CONCATENATED MODULE: ../polygon-editor/esm/index.js





var PolygonEditor = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.forwardRef)((props, ref) => {
var {
active,
polygon
active
} = props;
var {
map
} = useMapContext();
var polygon = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(PolygonContext);
var [visiable, setVisiable] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(true);
var [polyEditor, setPolyEditor] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)();
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useImperativeHandle)(ref, () => _extends({}, props, {
Expand All @@ -1906,75 +1907,26 @@ var PolygonEditor = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs
if (!polyEditor) {
return;
}
if (visiable && !active) {
if (visiable && !active && polygon) {
polyEditor.close();
props.onEnd && props.onEnd({
target: props.polygon
target: polygon
});
} else if (visiable && active) {
} else if (visiable && active && polygon) {
polyEditor.open();
props.onAdd && props.onAdd({
target: props.polygon
target: polygon
});
} else if (!visiable && active) {
} else if (!visiable && active && polygon) {
polyEditor.close();
props.onEnd && props.onEnd({
target: props.polygon
target: polygon
});
}
}, [active, visiable]);
}, [active, visiable, polygon]);
useEventProperties(polyEditor, props, ['onEnd', 'onAddnode', 'onRemovenode', 'onAdjust', 'onMove', 'onAdd']);
return null;
});
;// CONCATENATED MODULE: ../poly-editor/esm/index.js




var PolyEditor = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.forwardRef)((props, ref) => {
var {
active,
polyElement
} = props;
var {
map
} = useMapContext();
var [visiable, setVisiable] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(true);
var [polyEditor, setPolyEditor] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)();
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useImperativeHandle)(ref, () => _extends({}, props, {
polyEditor
}));
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
if (polyElement && map && !polyEditor && AMap && AMap.PolyEditor) {
var instance = new AMap.PolyEditor(map, polyElement);
polyElement.on('hide', () => setVisiable(false));
polyElement.on('show', () => setVisiable(true));
setPolyEditor(instance);
}
}, [polyElement]);
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
if (!polyEditor) {
return;
}
if (visiable && !active) {
polyEditor.close();
props.onEnd && props.onEnd({
type: 'end',
target: props.polyElement
});
} else if (visiable && active) {
polyEditor.open();
} else if (!visiable && active) {
polyEditor.close();
props.onEnd && props.onEnd({
type: 'end',
target: props.polyElement
});
}
}, [active, visiable]);
useEventProperties(polyEditor, props, ['onEnd', 'onAddnode', 'onAdjust', 'onRemovenode']);
return null;
});
;// CONCATENATED MODULE: ../polyline/esm/usePolyline.js

var usePolyline_excluded = ["visiable"];
Expand Down Expand Up @@ -2032,6 +1984,8 @@ function usePolyline(props) {




var PolylineContext = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createContext)(undefined);
var Polyline = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef((props, ref) => {
var {
children
Expand All @@ -2042,28 +1996,78 @@ var Polyline = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_a
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useImperativeHandle)(ref, () => _extends({}, props, {
polyline
}), [polyline]);
if (children && /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.isValidElement)(children) && polyline) {
var oProps = {
polyElement: polyline,
polyline
};
return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.cloneElement)(children, _extends({}, props, oProps));
}
return /*#__PURE__*/(0,jsx_runtime.jsx)(PolylineContext.Provider, {
value: polyline,
children: children
});
});
;// CONCATENATED MODULE: ../poly-editor/esm/index.js






var PolyEditor = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.forwardRef)((props, ref) => {
var polyline = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(PolylineContext);
var polygon = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(PolygonContext);
var {
active,
polyElement = polyline || polygon
} = props;
var {
map
} = useMapContext();
var [visiable, setVisiable] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(true);
var [polyEditor, setPolyEditor] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)();
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useImperativeHandle)(ref, () => _extends({}, props, {
polyEditor
}));
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
if (polyElement && map && !polyEditor && AMap && AMap.PolyEditor) {
var instance = new AMap.PolyEditor(map, polyElement);
polyElement.on('hide', () => setVisiable(false));
polyElement.on('show', () => setVisiable(true));
setPolyEditor(instance);
}
}, [polyElement]);
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
if (!polyEditor) {
return;
}
if (visiable && !active) {
polyEditor.close();
props.onEnd && props.onEnd({
type: 'end',
target: props.polyElement
});
} else if (visiable && active) {
polyEditor.open();
} else if (!visiable && active) {
polyEditor.close();
props.onEnd && props.onEnd({
type: 'end',
target: props.polyElement
});
}
}, [active, visiable]);
useEventProperties(polyEditor, props, ['onEnd', 'onAddnode', 'onAdjust', 'onRemovenode']);
return null;
});
;// CONCATENATED MODULE: ../polyline-editor/esm/index.js





var PolylineEditor = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.forwardRef)((props, ref) => {
var {
active,
polyline
active
} = props;
var {
map
} = useMapContext();
var polyline = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(PolylineContext);
var [visiable, setVisiable] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(true);
var [polyEditor, setPolyEditor] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)();
(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useImperativeHandle)(ref, () => _extends({}, props, {
Expand All @@ -2081,23 +2085,23 @@ var PolylineEditor = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonj
if (!polyEditor) {
return;
}
if (visiable && !active) {
if (visiable && !active && polyline) {
polyEditor.close();
props.onEnd && props.onEnd({
target: props.polyline
target: polyline
});
} else if (visiable && active) {
} else if (visiable && active && polyline) {
polyEditor.open();
props.onAdd && props.onAdd({
target: props.polyline
target: polyline
});
} else if (!visiable && active) {
} else if (!visiable && active && polyline) {
polyEditor.close();
props.onEnd && props.onEnd({
target: props.polyline
target: polyline
});
}
}, [active, visiable, polyEditor]);
}, [active, visiable, polyline, polyEditor]);
useEventProperties(polyEditor, props, ['onEnd', 'onAddnode', 'onRemovenode', 'onAdjust', 'onAdd']);
return null;
});
Expand Down
2 changes: 1 addition & 1 deletion amap.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 1e4c0b0

Please sign in to comment.