@mapcomponents/react-maplibre 0.1.95 → 0.1.96

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # Change Log
2
2
 
3
+
4
+ ## [v0.1.96] - 2024-01-29
5
+
6
+ ### Fixed
7
+
8
+ - 2925672: fix overwrite options.paint in LayerListItem
9
+
3
10
  ## [v0.1.95] - 2024-01-23
4
11
 
5
12
  ### Fixed
package/dist/index.esm.js CHANGED
@@ -6677,16 +6677,16 @@ var DeleteIconButton = material.styled(material.IconButton)({
6677
6677
  marginLeft: '20px',
6678
6678
  });
6679
6679
  function LayerListItem(_a) {
6680
- var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
6680
+ var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
6681
6681
  var layerComponent = _a.layerComponent, visible = _a.visible, type = _a.type, name = _a.name, description = _a.description, configurable = _a.configurable, setLayerState = _a.setLayerState, props = __rest(_a, ["layerComponent", "visible", "type", "name", "description", "configurable", "setLayerState"]);
6682
- var _p = React.useState(true), localVisible = _p[0], setLocalVisible = _p[1];
6683
- var _q = React.useState(false), paintPropsFormVisible = _q[0], setPaintPropsFormVisible = _q[1];
6684
- var _r = React.useState(false), showDeletionConfirmationDialog = _r[0], setShowDeletionConfirmationDialog = _r[1];
6682
+ var _r = React.useState(true), localVisible = _r[0], setLocalVisible = _r[1];
6683
+ var _s = React.useState(false), paintPropsFormVisible = _s[0], setPaintPropsFormVisible = _s[1];
6684
+ var _t = React.useState(false), showDeletionConfirmationDialog = _t[0], setShowDeletionConfirmationDialog = _t[1];
6685
6685
  var deletedRef = React.useRef(false);
6686
6686
  var visibleRef = React.useRef(visible);
6687
6687
  // this state variable is used for layer components that provide a paint attribute
6688
- var _s = React.useState(((_b = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _b === void 0 ? void 0 : _b.paint) ||
6689
- getDefaultPaintPropsByType(((_c = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _c === void 0 ? void 0 : _c.type) || getDefaulLayerTypeByGeometry(layerComponent.props.geojson))), paintProps = _s[0], setPaintProps = _s[1];
6688
+ var _u = React.useState(((_b = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _b === void 0 ? void 0 : _b.paint) || ((_d = (_c = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.paint) ||
6689
+ getDefaultPaintPropsByType(((_e = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _e === void 0 ? void 0 : _e.type) || getDefaulLayerTypeByGeometry(layerComponent.props.geojson))), paintProps = _u[0], setPaintProps = _u[1];
6690
6690
  var _visible = React.useMemo(function () {
6691
6691
  if (!visible) {
6692
6692
  return false;
@@ -6726,8 +6726,9 @@ function LayerListItem(_a) {
6726
6726
  if (JSON.stringify(paintProps) === JSON.stringify((_b = layerComponent.props) === null || _b === void 0 ? void 0 : _b.paint))
6727
6727
  return;
6728
6728
  setLayerState(__assign(__assign({}, layerComponent.props), { paint: paintProps }));
6729
- }, [paintProps, setLayerState, (_d = layerComponent.props) === null || _d === void 0 ? void 0 : _d.paint]);
6729
+ }, [paintProps, setLayerState, (_f = layerComponent.props) === null || _f === void 0 ? void 0 : _f.paint]);
6730
6730
  var _layerComponent = React.useMemo(function () {
6731
+ var _a;
6731
6732
  if (layerComponent && type === 'layer') {
6732
6733
  switch (layerComponent.type.name) {
6733
6734
  case 'MlWmsLayer':
@@ -6736,13 +6737,16 @@ function LayerListItem(_a) {
6736
6737
  return React__default["default"].cloneElement(layerComponent, __assign({}, layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props));
6737
6738
  default:
6738
6739
  case 'MlGeoJsonLayer':
6739
- return React__default["default"].cloneElement(layerComponent, __assign({ layout: {
6740
+ return React__default["default"].cloneElement(layerComponent, {
6741
+ layout: {
6740
6742
  visibility: _visible ? 'visible' : 'none',
6741
- } }, (setLayerState ? {} : { paint: paintProps })));
6743
+ },
6744
+ options: __assign(__assign({}, (_a = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _a === void 0 ? void 0 : _a.options), (setLayerState ? {} : { paint: paintProps }))
6745
+ });
6742
6746
  }
6743
6747
  }
6744
6748
  return React__default["default"].createElement(React__default["default"].Fragment, null);
6745
- }, [type, layerComponent, paintProps, _visible, (_e = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _e === void 0 ? void 0 : _e.layers, setLayerState]);
6749
+ }, [type, layerComponent, paintProps, _visible, (_g = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _g === void 0 ? void 0 : _g.layers, setLayerState]);
6746
6750
  var layerType = React.useMemo(function () {
6747
6751
  if (layerComponent && type === 'layer') {
6748
6752
  if (layerComponent.props.type) {
@@ -6754,7 +6758,7 @@ function LayerListItem(_a) {
6754
6758
  }
6755
6759
  return undefined;
6756
6760
  }, [layerComponent]);
6757
- var listContent = (React__default["default"].createElement(ListItemStyled, { sx: __assign({}, props.listItemSx), secondaryAction: configurable && ((_f = Object.keys(paintProps)) === null || _f === void 0 ? void 0 : _f.length) > 0 ? (React__default["default"].createElement(React__default["default"].Fragment, null, props === null || props === void 0 ? void 0 :
6761
+ var listContent = (React__default["default"].createElement(ListItemStyled, { sx: __assign({}, props.listItemSx), secondaryAction: configurable && ((_h = Object.keys(paintProps)) === null || _h === void 0 ? void 0 : _h.length) > 0 ? (React__default["default"].createElement(React__default["default"].Fragment, null, props === null || props === void 0 ? void 0 :
6758
6762
  props.buttons,
6759
6763
  React__default["default"].createElement(TuneIconButton, { edge: 'end', "aria-label": "settings", onClick: function () {
6760
6764
  setPaintPropsFormVisible(function (current) {
@@ -6768,10 +6772,10 @@ function LayerListItem(_a) {
6768
6772
  } })),
6769
6773
  React__default["default"].createElement(material.ListItemText, { variant: "layerlist", primary: name, secondary: description, primaryTypographyProps: { overflow: 'hidden' } })));
6770
6774
  return (React__default["default"].createElement(React__default["default"].Fragment, null,
6771
- props.sortable && props.layerId && !((_g = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _g === void 0 ? void 0 : _g.layers) && (React__default["default"].createElement(SortableContainer, { layerId: props.layerId }, listContent)),
6772
- !props.sortable && !((_h = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _h === void 0 ? void 0 : _h.layers) && (listContent),
6775
+ props.sortable && props.layerId && !((_j = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _j === void 0 ? void 0 : _j.layers) && (React__default["default"].createElement(SortableContainer, { layerId: props.layerId }, listContent)),
6776
+ !props.sortable && !((_k = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _k === void 0 ? void 0 : _k.layers) && (listContent),
6773
6777
  _layerComponent,
6774
- !((_j = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _j === void 0 ? void 0 : _j.layers) &&
6778
+ !((_l = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _l === void 0 ? void 0 : _l.layers) &&
6775
6779
  Object.keys(paintProps).length > 0 &&
6776
6780
  configurable &&
6777
6781
  paintPropsFormVisible && (React__default["default"].createElement(React__default["default"].Fragment, null,
@@ -6792,7 +6796,7 @@ function LayerListItem(_a) {
6792
6796
  setShowDeletionConfirmationDialog(false);
6793
6797
  }, title: "Delete layer", text: "Are you sure you want to delete this layer?" })))),
6794
6798
  React__default["default"].createElement(LayerPropertyForm, { paintProps: paintProps, setPaintProps: setPaintProps, layerType: layerType }))),
6795
- ((_k = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _k === void 0 ? void 0 : _k.layers) && (React__default["default"].createElement(LayerListFolder, { visible: localVisible, setVisible: setLocalVisible, name: name }, (_o = (_m = (_l = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _l === void 0 ? void 0 : _l.layers) === null || _m === void 0 ? void 0 : _m.map) === null || _o === void 0 ? void 0 : _o.call(_m, function (_el, idx) { return (React__default["default"].createElement(LayerListItemVectorLayer, { vtProps: layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props, setVtProps: setLayerState, id: '' + idx, key: '' + idx, visibleMaster: _visible })); })))));
6799
+ ((_m = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _m === void 0 ? void 0 : _m.layers) && (React__default["default"].createElement(LayerListFolder, { visible: localVisible, setVisible: setLocalVisible, name: name }, (_q = (_p = (_o = layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props) === null || _o === void 0 ? void 0 : _o.layers) === null || _p === void 0 ? void 0 : _p.map) === null || _q === void 0 ? void 0 : _q.call(_p, function (_el, idx) { return (React__default["default"].createElement(LayerListItemVectorLayer, { vtProps: layerComponent === null || layerComponent === void 0 ? void 0 : layerComponent.props, setVtProps: setLayerState, id: '' + idx, key: '' + idx, visibleMaster: _visible })); })))));
6796
6800
  }
6797
6801
  LayerListItem.defaultProps = {
6798
6802
  type: 'layer',