@summeruse/ol 0.2.0 → 0.3.1

package/es/composables/usePointermove/index.d.ts

@@ -40,23 +40,26 @@ export interface UsePointermoveOptions<T extends Option = Option> {
     mapRef: MaybeRefOrGetter<OLMap | undefined>;
     /** 提示配置列表 */
     items: MaybeRefOrGetter<PointermoveList<T>>;
-    /** 前置判断条件 */
-    enabled?: boolean | (() => boolean | undefined | void);
     /** 强制更新 （开启后，无论 feature 是否变化，都强制更新提示） */
     forceUpdate?: boolean;
 }
-export declare function usePointermove<T extends Option>({ mapRef, items, enabled, forceUpdate }: UsePointermoveOptions<T>): {
+export declare function usePointermove<T extends Option>({ mapRef, items, forceUpdate }: UsePointermoveOptions<T>): {
     visible: import('vue').ComputedRef<boolean>;
     position: import('vue').ComputedRef<{
         x: number;
         y: number;
     }>;
+    offset: import('vue').ComputedRef<{
+        x: number;
+        y: number;
+    }>;
     originalPosition: import('vue').ComputedRef<{
         x: number;
         y: number;
     }>;
     feature: import('vue').ComputedRef<FeatureLike | undefined>;
     content: import('vue').ComputedRef<string | (() => VNodeChild) | undefined>;
+    originalCoordinate: import('vue').ComputedRef<Coordinate | undefined>;
     coordinate: import('vue').ComputedRef<Coordinate | undefined>;
     option: import('vue').ComputedRef<T | undefined>;
     hide: () => void;

package/es/composables/usePointermove/index.mjs

@@ -1,95 +1,91 @@
 import { computed, onBeforeUnmount, ref, toValue, watch } from "vue";
 import { getCenter } from "ol/extent";
-function usePointermove({ mapRef: o, items: s, enabled: c = !0, forceUpdate: l = !1 }) {
-	let u = ref(!1), d = ref({
+function usePointermove({ mapRef: o, items: s, forceUpdate: c = !1 }) {
+	let l = ref(!1), u = ref({
 		x: 0,
 		y: 0
-	}), f = ref(), p = ref(), m = ref({
+	}), d = ref(), f = ref(), p = ref({
 		x: 0,
 		y: 0
-	}), h = ref(), g = ref(), _ = computed(() => ({
-		x: d.value.x + m.value.x,
-		y: d.value.y + m.value.y
-	})), v = () => typeof c == "function" ? c() : c, y, b, x = "";
-	function S(e) {
+	}), m = ref(), h = ref(), g = ref(), _ = computed(() => ({
+		x: u.value.x + p.value.x,
+		y: u.value.y + p.value.y
+	})), v, y, b = "";
+	function x(e) {
 		let t = toValue(s);
 		return t.sort((e, t) => (t.priority ?? 0) - (e.priority ?? 0)), t.find((t) => {
 			let n = t.visible;
 			return typeof n == "function" ? n(e) : n ?? !0;
 		});
 	}
-	function C(e) {
-		if (!v()) {
-			w();
-			return;
-		}
-		if (!y || !b) return;
-		let t = y.getEventCoordinate(e);
-		h.value = t;
-		let n = y.getEventPixel(e), r, i;
-		if (y.forEachFeatureAtPixel(n, (e, t) => (r = e, i = t, !0)), !r) {
-			w();
+	function S(e) {
+		if (e.dragging || !v || !y) return;
+		let t = e.coordinate;
+		m.value = t, h.value = t;
+		let n = e.pixel, r, i;
+		if (v.forEachFeatureAtPixel(n, (e, t) => (r = e, i = t, !0)), !r) {
+			C();
 			return;
 		}
-		if (!l && f.value && f.value.getId() === r.getId()) return;
-		f.value = r;
-		let o = {
-			map: y,
+		if (!c && d.value && d.value.getId() === r.getId()) return;
+		d.value = r;
+		let { top: o, left: s } = y.getBoundingClientRect(), _ = {
+			map: v,
 			position: {
-				x: e.clientX,
-				y: e.clientY
+				x: n[0] + s,
+				y: n[1] + o
 			},
 			coordinate: t,
 			feature: r,
 			layer: i
-		}, s = S(o);
-		if (s) {
-			let { content: e, cursor: t, visible: n, fixedFeatureCenter: r, offset: i, priority: a,...o } = s;
+		}, b = x(_);
+		if (b) {
+			let { content: e, cursor: t, visible: n, fixedFeatureCenter: r, offset: i, priority: a,...o } = b;
 			g.value = { ...o };
 		}
-		if (!s) {
-			w();
+		if (!b) {
+			C();
 			return;
 		}
-		m.value = {
-			x: s.offset?.x ?? 0,
-			y: s.offset?.y ?? 0
+		p.value = {
+			x: b.offset?.x ?? 0,
+			y: b.offset?.y ?? 0
 		};
-		let c = l === !1 ? !0 : s.fixedFeatureCenter ?? !0, _ = r.getGeometry();
-		if (c && _) {
-			let e = getCenter(_.getExtent()), t = y.getPixelFromCoordinate(e), { top: n, left: r } = b.getBoundingClientRect();
-			d.value.x = t[0] + r, d.value.y = t[1] + n;
-		} else d.value = {
-			x: e.clientX,
-			y: e.clientY
-		};
-		let x = s.content;
-		p.value = typeof x == "function" ? () => x(o) : x;
-		let C = s.cursor, T = typeof C == "function" ? C(o) : C;
-		T !== void 0 && T !== b.style.cursor && (b.style.cursor = T), u.value = !0;
+		let S = c === !1 ? !0 : b.fixedFeatureCenter ?? !0, w = r.getGeometry();
+		if (S && w) {
+			let e = getCenter(w.getExtent());
+			h.value = e, n = v.getPixelFromCoordinate(e);
+		}
+		u.value.x = n[0] + s, u.value.y = n[1] + o;
+		let T = b.content;
+		f.value = typeof T == "function" ? () => T(_) : T;
+		let E = b.cursor, D = typeof E == "function" ? E(_) : E;
+		D !== void 0 && D !== y.style.cursor && (y.style.cursor = D), l.value = !0;
 	}
-	function w() {
-		u.value = !1, f.value = void 0, b && b.style.cursor !== x && (b.style.cursor = x);
+	function C() {
+		l.value = !1, d.value = void 0, y && y.style.cursor !== b && (y.style.cursor = b);
 	}
-	function T(e) {
-		e.addEventListener("pointermove", C);
+	function w(e) {
+		e.on("pointermove", S);
 	}
-	function E(e) {
-		e.removeEventListener("pointermove", C);
+	function T(e) {
+		e.un("pointermove", S);
 	}
 	return watch(() => toValue(o), (e, t) => {
-		t !== e && (y = e, e && (b = e.getViewport(), E(b), T(b), x = b.style.cursor));
+		t && T(t), t !== e && (v = e, e && (y = e.getViewport(), w(e), b = y.style.cursor));
 	}, { immediate: !0 }), onBeforeUnmount(() => {
-		b && E(b);
+		v && T(v);
 	}), {
-		visible: computed(() => u.value),
+		visible: computed(() => l.value),
 		position: computed(() => _.value),
-		originalPosition: computed(() => d.value),
-		feature: computed(() => f.value),
-		content: computed(() => p.value),
+		offset: computed(() => p.value),
+		originalPosition: computed(() => u.value),
+		feature: computed(() => d.value),
+		content: computed(() => f.value),
+		originalCoordinate: computed(() => m.value),
 		coordinate: computed(() => h.value),
 		option: computed(() => g.value),
-		hide: w
+		hide: C
 	};
 }
 export { usePointermove };

package/lib/composables/usePointermove/index.d.ts

@@ -40,23 +40,26 @@ export interface UsePointermoveOptions<T extends Option = Option> {
     mapRef: MaybeRefOrGetter<OLMap | undefined>;
     /** 提示配置列表 */
     items: MaybeRefOrGetter<PointermoveList<T>>;
-    /** 前置判断条件 */
-    enabled?: boolean | (() => boolean | undefined | void);
     /** 强制更新 （开启后，无论 feature 是否变化，都强制更新提示） */
     forceUpdate?: boolean;
 }
-export declare function usePointermove<T extends Option>({ mapRef, items, enabled, forceUpdate }: UsePointermoveOptions<T>): {
+export declare function usePointermove<T extends Option>({ mapRef, items, forceUpdate }: UsePointermoveOptions<T>): {
     visible: import('vue').ComputedRef<boolean>;
     position: import('vue').ComputedRef<{
         x: number;
         y: number;
     }>;
+    offset: import('vue').ComputedRef<{
+        x: number;
+        y: number;
+    }>;
     originalPosition: import('vue').ComputedRef<{
         x: number;
         y: number;
     }>;
     feature: import('vue').ComputedRef<FeatureLike | undefined>;
     content: import('vue').ComputedRef<string | (() => VNodeChild) | undefined>;
+    originalCoordinate: import('vue').ComputedRef<Coordinate | undefined>;
     coordinate: import('vue').ComputedRef<Coordinate | undefined>;
     option: import('vue').ComputedRef<T | undefined>;
     hide: () => void;

package/lib/composables/usePointermove/index.js

@@ -1 +1 @@
-const e=require(`../../_virtual/rolldown_runtime.js`);let t=require(`vue`);t=e.__toESM(t);let n=require(`ol/extent`);n=e.__toESM(n);function r({mapRef:e,items:r,enabled:i=!0,forceUpdate:a=!1}){let o=(0,t.ref)(!1),s=(0,t.ref)({x:0,y:0}),c=(0,t.ref)(),l=(0,t.ref)(),u=(0,t.ref)({x:0,y:0}),d=(0,t.ref)(),f=(0,t.ref)(),p=(0,t.computed)(()=>({x:s.value.x+u.value.x,y:s.value.y+u.value.y})),m=()=>typeof i==`function`?i():i,h,g,_=``;function v(e){let n=(0,t.toValue)(r);return n.sort((e,t)=>(t.priority??0)-(e.priority??0)),n.find(t=>{let n=t.visible;return typeof n==`function`?n(e):n??!0})}function y(e){if(!m()){b();return}if(!h||!g)return;let t=h.getEventCoordinate(e);d.value=t;let r=h.getEventPixel(e),i,p;if(h.forEachFeatureAtPixel(r,(e,t)=>(i=e,p=t,!0)),!i){b();return}if(!a&&c.value&&c.value.getId()===i.getId())return;c.value=i;let _={map:h,position:{x:e.clientX,y:e.clientY},coordinate:t,feature:i,layer:p},y=v(_);if(y){let{content:e,cursor:t,visible:n,fixedFeatureCenter:r,offset:i,priority:a,...o}=y;f.value={...o}}if(!y){b();return}u.value={x:y.offset?.x??0,y:y.offset?.y??0};let x=a===!1?!0:y.fixedFeatureCenter??!0,S=i.getGeometry();if(x&&S){let e=(0,n.getCenter)(S.getExtent()),t=h.getPixelFromCoordinate(e),{top:r,left:i}=g.getBoundingClientRect();s.value.x=t[0]+i,s.value.y=t[1]+r}else s.value={x:e.clientX,y:e.clientY};let C=y.content;l.value=typeof C==`function`?()=>C(_):C;let w=y.cursor,T=typeof w==`function`?w(_):w;T!==void 0&&T!==g.style.cursor&&(g.style.cursor=T),o.value=!0}function b(){o.value=!1,c.value=void 0,g&&g.style.cursor!==_&&(g.style.cursor=_)}function x(e){e.addEventListener(`pointermove`,y)}function S(e){e.removeEventListener(`pointermove`,y)}return(0,t.watch)(()=>(0,t.toValue)(e),(e,t)=>{t!==e&&(h=e,e&&(g=e.getViewport(),S(g),x(g),_=g.style.cursor))},{immediate:!0}),(0,t.onBeforeUnmount)(()=>{g&&S(g)}),{visible:(0,t.computed)(()=>o.value),position:(0,t.computed)(()=>p.value),originalPosition:(0,t.computed)(()=>s.value),feature:(0,t.computed)(()=>c.value),content:(0,t.computed)(()=>l.value),coordinate:(0,t.computed)(()=>d.value),option:(0,t.computed)(()=>f.value),hide:b}}exports.usePointermove=r;
+const e=require(`../../_virtual/rolldown_runtime.js`);let t=require(`vue`);t=e.__toESM(t);let n=require(`ol/extent`);n=e.__toESM(n);function r({mapRef:e,items:r,forceUpdate:i=!1}){let a=(0,t.ref)(!1),o=(0,t.ref)({x:0,y:0}),s=(0,t.ref)(),c=(0,t.ref)(),l=(0,t.ref)({x:0,y:0}),u=(0,t.ref)(),d=(0,t.ref)(),f=(0,t.ref)(),p=(0,t.computed)(()=>({x:o.value.x+l.value.x,y:o.value.y+l.value.y})),m,h,g=``;function _(e){let n=(0,t.toValue)(r);return n.sort((e,t)=>(t.priority??0)-(e.priority??0)),n.find(t=>{let n=t.visible;return typeof n==`function`?n(e):n??!0})}function v(e){if(e.dragging||!m||!h)return;let t=e.coordinate;u.value=t,d.value=t;let r=e.pixel,p,g;if(m.forEachFeatureAtPixel(r,(e,t)=>(p=e,g=t,!0)),!p){y();return}if(!i&&s.value&&s.value.getId()===p.getId())return;s.value=p;let{top:v,left:b}=h.getBoundingClientRect(),x={map:m,position:{x:r[0]+b,y:r[1]+v},coordinate:t,feature:p,layer:g},S=_(x);if(S){let{content:e,cursor:t,visible:n,fixedFeatureCenter:r,offset:i,priority:a,...o}=S;f.value={...o}}if(!S){y();return}l.value={x:S.offset?.x??0,y:S.offset?.y??0};let C=i===!1?!0:S.fixedFeatureCenter??!0,w=p.getGeometry();if(C&&w){let e=(0,n.getCenter)(w.getExtent());d.value=e,r=m.getPixelFromCoordinate(e)}o.value.x=r[0]+b,o.value.y=r[1]+v;let T=S.content;c.value=typeof T==`function`?()=>T(x):T;let E=S.cursor,D=typeof E==`function`?E(x):E;D!==void 0&&D!==h.style.cursor&&(h.style.cursor=D),a.value=!0}function y(){a.value=!1,s.value=void 0,h&&h.style.cursor!==g&&(h.style.cursor=g)}function b(e){e.on(`pointermove`,v)}function x(e){e.un(`pointermove`,v)}return(0,t.watch)(()=>(0,t.toValue)(e),(e,t)=>{t&&x(t),t!==e&&(m=e,e&&(h=e.getViewport(),b(e),g=h.style.cursor))},{immediate:!0}),(0,t.onBeforeUnmount)(()=>{m&&x(m)}),{visible:(0,t.computed)(()=>a.value),position:(0,t.computed)(()=>p.value),offset:(0,t.computed)(()=>l.value),originalPosition:(0,t.computed)(()=>o.value),feature:(0,t.computed)(()=>s.value),content:(0,t.computed)(()=>c.value),originalCoordinate:(0,t.computed)(()=>u.value),coordinate:(0,t.computed)(()=>d.value),option:(0,t.computed)(()=>f.value),hide:y}}exports.usePointermove=r;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@summeruse/ol",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "",
   "author": "finalsummer",
   "license": "ISC",