Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/core-optional-map-viewport.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@mapsight/core": patch
"@mapsight/ui": patch
---

Handle unavailable map targets and viewports in cursor updates and map context menus with OpenLayers 10.11.
7 changes: 7 additions & 0 deletions .changeset/dependabot-364-mapsight-count-aggregator-ui.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@mapsight/count-aggregator-ui": patch
---

Bump dependencies from Dependabot ([#364](https://github.com/open-mapsight/mapsight/pull/364)):

- `@tanstack/react-query` `^5.103.2` → `^5.104.1` (minor)
8 changes: 8 additions & 0 deletions .changeset/dependabot-364-mapsight-host-starter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"mapsight-host-starter": patch
---

Bump dependencies from Dependabot ([#364](https://github.com/open-mapsight/mapsight/pull/364)):

- `@types/node` `^24.13.6` → `^24.19.1` (minor)
- `ol` `^10.10.0` → `^10.11.0` (minor)
9 changes: 9 additions & 0 deletions .changeset/dependabot-364-mapsight-next-starter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"mapsight-next-starter": patch
---

Bump dependencies from Dependabot ([#364](https://github.com/open-mapsight/mapsight/pull/364)):

- `@types/node` `^24.13.6` → `^24.19.1` (minor)
- `ol` `^10.10.0` → `^10.11.0` (minor)
- `postcss` `^8.5.28` → `^8.5.29` (patch)
7 changes: 7 additions & 0 deletions .changeset/dependabot-364-mapsight-showcase.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@mapsight/showcase": patch
---

Bump dependencies from Dependabot ([#364](https://github.com/open-mapsight/mapsight/pull/364)):

- `@tanstack/react-query` `^5.103.2` → `^5.104.1` (minor)
7 changes: 7 additions & 0 deletions .changeset/dependabot-364-mapsight-traffic-style.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@mapsight/traffic-style": patch
---

Bump dependencies from Dependabot ([#364](https://github.com/open-mapsight/mapsight/pull/364)):

- `sharp` `^0.35.4` → `^0.35.5` (patch)
7 changes: 7 additions & 0 deletions .changeset/dependabot-364-mapsight-ui.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@mapsight/ui": patch
---

Bump dependencies from Dependabot ([#364](https://github.com/open-mapsight/mapsight/pull/364)):

- `@tanstack/react-query` `^5.103.2` → `^5.104.1` (minor)
7 changes: 7 additions & 0 deletions .changeset/dependabot-364-mapsight-vector-style-compiler.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@mapsight/vector-style-compiler": patch
---

Bump dependencies from Dependabot ([#364](https://github.com/open-mapsight/mapsight/pull/364)):

- `postcss` `^8.5.28` → `^8.5.29` (patch)
8 changes: 8 additions & 0 deletions .changeset/dependabot-364-mapsight-vite-spa-starter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"mapsight-vite-spa-starter": patch
---

Bump dependencies from Dependabot ([#364](https://github.com/open-mapsight/mapsight/pull/364)):

- `@types/node` `^24.13.6` → `^24.19.1` (minor)
- `ol` `^10.10.0` → `^10.11.0` (minor)
5 changes: 5 additions & 0 deletions .changeset/lib-ol-nullable-map-target.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@mapsight/lib-ol": patch
---

Support nullable map targets in OpenLayers 10.11 transition helpers.
2 changes: 1 addition & 1 deletion apps/showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@mapsight/lib-redux": "workspace:^",
"@mapsight/traffic-style": "workspace:^",
"@mapsight/ui": "workspace:^",
"@tanstack/react-query": "^5.103.2",
"@tanstack/react-query": "^5.104.1",
"breakpoint-sass": "^3.0.0",
"lodash": "catalog:",
"ol": "catalog:",
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/js/lib/map/lib/WithCursor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ export default class WithCursor extends WithMap {
this.getAndObserveUncontrolled(
(state) => state.cursor as string | undefined,
(newCursor = DEFAULT_CURSOR) => {
const map = this.getMap();
if (map) {
map.getViewport().style.cursor = newCursor;
const viewport = this.getMap()?.getViewport();
if (viewport) {
viewport.style.cursor = newCursor;
}
},
);
Expand Down
4 changes: 2 additions & 2 deletions packages/count-aggregator-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"@mapsight/count-aggregator-api": "workspace:^",
"@mapsight/traffic-style": "workspace:^",
"@tanstack/react-query": "^5.103.2",
"@tanstack/react-query": "^5.104.1",
"clsx": "^2.1.1",
"flatpickr": "^4.6.13",
"react-flatpickr": "^4.0.11",
Expand Down Expand Up @@ -47,7 +47,7 @@
"license": "MIT",
"peerDependencies": {
"@mapsight/ui": "workspace:^",
"@tanstack/react-query": "^5.103.2",
"@tanstack/react-query": "^5.104.1",
"react": "catalog:",
"react-dom": "catalog:",
"react-select": "^5.10.2"
Expand Down
6 changes: 3 additions & 3 deletions packages/lib-ol/src/js/map/animateDuringTransition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ export default function animateDuringTransition(
}

let isTransitionRunning = true;
const maxTimeTimeout = setTimeout(endAnimation, maxTime);

function endAnimation() {
const endAnimation = () => {
isTransitionRunning = false;
clearTimeout(maxTimeTimeout);
targetElement.removeEventListener("transitionend", endAnimation);
}
};
const maxTimeTimeout = setTimeout(endAnimation, maxTime);

animationLoop((deltaT) => render(deltaT) !== false && isTransitionRunning);
targetElement.addEventListener("transitionend", endAnimation);
Expand Down
2 changes: 1 addition & 1 deletion packages/lib-ol/src/js/map/updateSizeOnTransitionEnd.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type OlMap from "ol/Map";

export default function updateSizeOnTransitionEnd(map: OlMap) {
let previousTargetElement: undefined | HTMLElement;
let previousTargetElement: undefined | null | HTMLElement;

function updateSize() {
map.updateSize();
Expand Down
2 changes: 1 addition & 1 deletion packages/traffic-style/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"lru-cache": "^11.5.3",
"merge-stream": "^2.0.0",
"ol": "catalog:",
"sharp": "^0.35.4",
"sharp": "^0.35.5",
"svgo": "^4.1.0",
"vinyl": "^3.0.1",
"zod": "catalog:"
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"zod": "catalog:"
},
"devDependencies": {
"@tanstack/react-query": "^5.103.2",
"@tanstack/react-query": "^5.104.1",
"@testing-library/react": "^16.3.3",
"@types/lodash": "catalog:",
"@types/react": "catalog:",
Expand Down Expand Up @@ -182,7 +182,7 @@
"homepage": "https://github.com/open-mapsight/mapsight/tree/main/packages/ui#readme",
"license": "MIT",
"peerDependencies": {
"@tanstack/react-query": "^5.103.2",
"@tanstack/react-query": "^5.104.1",
"react": "catalog:",
"react-dom": "catalog:"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,10 @@ function MapPointContextMenu({
const map = getOlMap(store, mapControllerName);
if (
!map ||
!eventTargetIsInMap(event.target, map.getTargetElement())
!eventTargetIsInMap(
event.target,
map.getTargetElement() ?? null,
)
) {
return;
}
Expand All @@ -296,7 +299,10 @@ function MapPointContextMenu({
const map = getOlMap(store, mapControllerName);
if (
!map ||
!eventTargetIsInMap(event.target, map.getTargetElement())
!eventTargetIsInMap(
event.target,
map.getTargetElement() ?? null,
)
) {
pointerDownRef.current = null;
return;
Expand Down
2 changes: 1 addition & 1 deletion packages/vector-style-compiler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@types/node": "catalog:",
"chokidar": "^5.0.0",
"lodash": "catalog:",
"postcss": "^8.5.28",
"postcss": "^8.5.29",
"sass": "^1.105.0"
},
"devDependencies": {
Expand Down
Loading
Loading