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
20 changes: 0 additions & 20 deletions .storybook/preview.ts

This file was deleted.

32 changes: 32 additions & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import React from 'react';
import type { Preview, Decorator } from '@storybook/react';
import './style.css';

// Storybook parameters
const preview: Preview = {
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/,
},
},
options: {
storySort: {
order: ['Intro', 'Layers', 'Controls', 'Interactions'],
},
},
},
};

// Wrap all stories in React.StrictMode
export const decorators: Decorator[] = [
(Story) => (
<React.StrictMode>
<Story />
</React.StrictMode>
),
];

// Provides Storybook with your global config.
export default preview;
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-openlayers",
"version": "10.5.0",
"version": "10.5.1",
"description": "React + OpenLayers",
"author": "Allen Kim",
"type": "module",
Expand Down
11 changes: 6 additions & 5 deletions src/lib/Map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ export const Map = forwardRef<OlMap | undefined, MapProps>((props, ref) => {

useImperativeHandle(ref, () => map, [map]);

const mounted = useRef(false);
const defaultLayer = new TileLayer({ source: new OSM() });

useEffect(() => {
if (!mapRef.current || mounted.current) return;
if (!mapRef.current) return;
// Always create a new map instance on mount
const mapProps = {
...{
target: mapRef.current,
Expand All @@ -50,15 +50,16 @@ export const Map = forwardRef<OlMap | undefined, MapProps>((props, ref) => {
zoom: 2, // Default zoom level
}),
},
...props, // Override with props.view if provided
...props, // Override with props if provided
};
const olMap = new OlMap(mapProps);
setMap(olMap);
mounted.current = true;
return () => {
olMap.setTarget(undefined);
setMap(undefined);
console.log('Map unmounted');
};
}, []);
}, [mapRef]);

return (
<MapContext.Provider value={map}>
Expand Down
Loading