@realsee/dnalogel 2.0.0-alpha.15 → 2.0.0-alpha.16

package/libs/ModelItemLabelPlugin/ItemLabelComponent.js

@@ -36,11 +36,11 @@ function add_css(target) {
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = ctx.slice();
-	child_ctx[27] = list[i];
+	child_ctx[28] = list[i];
 	return child_ctx;
 }
 
-// (159:1) {#each renderItemLabels as itemLabelItem (itemLabelItem.id)}
+// (162:1) {#each renderItemLabels as itemLabelItem (itemLabelItem.id)}
 function create_each_block(key_1, ctx) {
 	let first;
 	let itemlabelitem;
@@ -48,7 +48,7 @@ function create_each_block(key_1, ctx) {
 
 	itemlabelitem = new ItemLabelItem({
 			props: {
-				itemLabel: /*itemLabelItem*/ ctx[27],
+				itemLabel: /*itemLabelItem*/ ctx[28],
 				hooks: /*hooks*/ ctx[0]
 			}
 		});
@@ -69,7 +69,7 @@ function create_each_block(key_1, ctx) {
 		p(new_ctx, dirty) {
 			ctx = new_ctx;
 			const itemlabelitem_changes = {};
-			if (dirty & /*renderItemLabels*/ 2) itemlabelitem_changes.itemLabel = /*itemLabelItem*/ ctx[27];
+			if (dirty & /*renderItemLabels*/ 2) itemlabelitem_changes.itemLabel = /*itemLabelItem*/ ctx[28];
 			if (dirty & /*hooks*/ 1) itemlabelitem_changes.hooks = /*hooks*/ ctx[0];
 			itemlabelitem.$set(itemlabelitem_changes);
 		},
@@ -96,7 +96,7 @@ function create_fragment(ctx) {
 	let div_resize_listener;
 	let current;
 	let each_value = /*renderItemLabels*/ ctx[1];
-	const get_key = ctx => /*itemLabelItem*/ ctx[27].id;
+	const get_key = ctx => /*itemLabelItem*/ ctx[28].id;
 
 	for (let i = 0; i < each_value.length; i += 1) {
 		let child_ctx = get_each_context(ctx, each_value, i);
@@ -247,6 +247,8 @@ function instance($$self, $$props, $$invalidate) {
 				return Math.ceil(-38.9 * itemSpaceHeight + 130);
 			case DISPLAY_STRATEGY_TYPE.LARGE:
 				return Math.ceil(-44.44 * itemSpaceHeight + 140);
+			case DISPLAY_STRATEGY_TYPE.EXTRA_LARGE:
+				return Math.ceil(-92.59 * itemSpaceHeight + 300);
 		}
 	}
 
@@ -293,16 +295,17 @@ function instance($$self, $$props, $$invalidate) {
 		addDataUpdateListener();
 	});
 
+	const handleCameraUpdateCallback = () => {
+		$$invalidate(4, itemsVisible = false);
+		handleCameraUpdate();
+	};
+
 	onMount(() => {
 		$$invalidate(1, renderItemLabels = itemLabels);
 		curItemLabels = itemLabels;
 		onItemLabelUpdate();
 		addResizeListener();
-
-		five.on('cameraUpdate', () => {
-			$$invalidate(4, itemsVisible = false);
-			handleCameraUpdate();
-		});
+		five.on('cameraUpdate', handleCameraUpdateCallback);
 	});
 
 	const handleCameraUpdate = debounce(
@@ -343,12 +346,11 @@ function instance($$self, $$props, $$invalidate) {
 		});
 
 	onDestroy(() => {
-		five.off('cameraUpdate');
+		five.off('cameraUpdate', handleCameraUpdateCallback);
 		resizeObserver.unobserve(wrapper);
-		curItemLabels = null;
-		$$invalidate(1, renderItemLabels = null);
-		wrapperSize = { width: 0, height: 0 };
-	});
+	}); // curItemLabels = null
+	// renderItemLabels = null
+	// wrapperSize = { width: 0, height: 0 }
 
 	function div_elementresize_handler() {
 		containerWidth = this.clientWidth;

package/libs/ModelItemLabelPlugin/index.js

@@ -23,6 +23,7 @@ export const ModelItemLabelPlugin = (five, params) => {
         top: 0;
         width: 100%;
         height: 100%;
+        z-index: 5;
     `;
     pluginState.container.style.pointerEvents = 'none'; // 写到 cssText 里不生效
     const appendTo = (wrapper) => {

package/libs/ModelItemLabelPlugin/typings.d.ts

@@ -4,7 +4,8 @@ import { PluginEvent } from "./events.type";
 export declare enum DISPLAY_STRATEGY_TYPE {
     SMALL = "small",
     MIDLLE = "middle",
-    LARGE = "large"
+    LARGE = "large",
+    EXTRA_LARGE = "x-large"
 }
 export interface ModelItemLabelPluginParametersType {
     modelOcclusionEnable?: boolean;

package/libs/ModelItemLabelPlugin/typings.js

@@ -3,4 +3,5 @@ export var DISPLAY_STRATEGY_TYPE;
     DISPLAY_STRATEGY_TYPE["SMALL"] = "small";
     DISPLAY_STRATEGY_TYPE["MIDLLE"] = "middle";
     DISPLAY_STRATEGY_TYPE["LARGE"] = "large";
+    DISPLAY_STRATEGY_TYPE["EXTRA_LARGE"] = "x-large";
 })(DISPLAY_STRATEGY_TYPE || (DISPLAY_STRATEGY_TYPE = {}));

package/libs/ModelRoomLabelPlugin/Controller.js

@@ -74,6 +74,7 @@ export class ModelRoomLabelController {
         this.container.style.pointerEvents = 'none';
         this.container.style.left = '0';
         this.container.style.top = '0';
+        this.container.style.zIndex = '5';
         // five listener
         this.five.once('dispose', () => this.dispose());
         this.five.on('modeChange', this.onFiveModeChange);

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.16",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "yarn run tsb && yarn run build:rollup && yarn build:docs",