@rxdrag/website-lib 0.0.66 → 0.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib",
-  "version": "0.0.66",
+  "version": "0.0.68",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -25,17 +25,17 @@
     "gsap": "^3.12.7",
     "typescript": "^5",
     "@rxdrag/rxcms-models": "0.3.89",
-    "@rxdrag/slate-preview": "1.2.58",
+    "@rxdrag/entify-hooks": "0.2.70",
     "@rxdrag/eslint-config-custom": "0.2.12",
-    "@rxdrag/tsconfig": "0.2.0",
-    "@rxdrag/entify-hooks": "0.2.70"
+    "@rxdrag/slate-preview": "1.2.58",
+    "@rxdrag/tsconfig": "0.2.0"
   },
   "dependencies": {
     "clsx": "^2.1.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "@rxdrag/website-lib-core": "0.0.65",
-    "@rxdrag/rxcms-models": "0.3.89"
+    "@rxdrag/rxcms-models": "0.3.89",
+    "@rxdrag/website-lib-core": "0.0.67"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

package/src/components/Background.astro

@@ -1,22 +1,25 @@
 ---
-import type { BackgroundConfig, IEntify } from "@rxdrag/website-lib-core";
+import type {
+  BackgroundConfig,
+  Locals,
+  VideoBackgroundConfig,
+} from "@rxdrag/website-lib-core";
 import {
   BackgroundVideoPlayer,
   BackgroundHlsVideoPlayer,
+  Entify,
 } from "@rxdrag/website-lib-core";
 
 export interface Props {
   background: BackgroundConfig;
   index?: number;
   defaultClass?: string;
-  rx: IEntify;
 }
 
-const {
-  background,
-  defaultClass = "absolute w-full h-full object-cover",
-  rx,
-} = Astro.props;
+const { env } = Astro.locals as Locals;
+
+const { background, defaultClass = "absolute w-full h-full object-cover" } =
+  Astro.props;
 
 // 安全地提取 mediaRef 和 posterRef（只有部分背景类型有这些属性）
 const mediaRef =
@@ -29,6 +32,8 @@ const mediaRef =
 const posterRef =
   background.type === "video" ? background.posterRef : undefined;
 
+const rx = Entify.getInstance(env);
+
 // 获取媒体数据
 const media = rx ? await rx.getMedia(mediaRef) : undefined;
 const poster = rx ? await rx.getMedia(posterRef) : undefined;
@@ -40,13 +45,9 @@ const className = [defaultClass, background.className]
 
 // 预计算视频相关数据
 const videoUrl =
-  background.type === "video"
-    ? media?.file?.original || background.url
-    : undefined;
+  background.type === "video" ? media?.file?.original : undefined;
 const posterUrl =
-  background.type === "video"
-    ? poster?.file?.original || background.poster
-    : undefined;
+  background.type === "video" ? poster?.file?.original : undefined;
 const isHls =
   background.type === "video" &&
   (media?.storageType === "cloudflare_stream" ||
@@ -55,9 +56,7 @@ const isHls =
 
 // 预计算图片 URL
 const imageUrl =
-  background.type === "image"
-    ? media?.file?.original || background.url
-    : undefined;
+  background.type === "image" ? media?.file?.original : undefined;
 
 // 预计算 Spline URL
 const splineUrl =

package/src/components/BackgroundGroup.astro

@@ -1,21 +1,21 @@
 ---
-import type { BackgroundConfig, IEntify } from "@rxdrag/website-lib-core";
+import type { BackgroundConfig } from "@rxdrag/website-lib-core";
 import Background from "./Background.astro";
 
 interface Props {
-  rx: IEntify;
   backgrounds?: BackgroundConfig[];
 }
 
-const { backgrounds, rx } = Astro.props;
+const { backgrounds } = Astro.props;
 
-const defaultClass = "absolute w-full h-full inset-0 object-cover object-center";
+const defaultClass =
+  "absolute w-full h-full inset-0 object-cover object-center";
 ---
 
 <Fragment>
   {
     backgrounds?.map((background) => (
-      <Background background={background} rx={rx} defaultClass={defaultClass} />
+      <Background background={background} defaultClass={defaultClass} />
     ))
   }
 </Fragment>

package/src/components/Box.astro

@@ -2,7 +2,6 @@
 import type {
   AnimationConfig,
   BackgroundConfig,
-  IEntify,
 } from "@rxdrag/website-lib-core";
 import BackgroundGroup from "./BackgroundGroup.astro";
 
@@ -12,13 +11,12 @@ interface Props {
   backgrounds?: BackgroundConfig[];
   //动效
   animation?: AnimationConfig;
-  rx: IEntify;
 }
 
-const { className, class: originalClass, backgrounds, rx } = Astro.props;
+const { className, class: originalClass, backgrounds } = Astro.props;
 ---
 
 <div class:list={["w-full, h-full flex flex-col", className, originalClass]}>
-  <BackgroundGroup backgrounds={backgrounds} rx={rx} />
+  <BackgroundGroup backgrounds={backgrounds} />
   <slot />
 </div>

package/src/components/Grid.astro

@@ -2,7 +2,6 @@
 import type {
   AnimationConfig,
   BackgroundConfig,
-  IEntify,
 } from "@rxdrag/website-lib-core";
 import BackgroundGroup from "./BackgroundGroup.astro";
 
@@ -14,15 +13,14 @@ interface Props {
   backgrounds?: BackgroundConfig[];
   //动效
   animation?: AnimationConfig;
-  rx: IEntify;
 }
 
-const { className, class: originalClass, backgrounds, rx } = Astro.props;
+const { className, class: originalClass, backgrounds } = Astro.props;
 
 //布局容器
 ---
 
 <div class:list={["relative grid gap-12", className, originalClass]}>
-  <BackgroundGroup backgrounds={backgrounds} rx={rx} />
+  <BackgroundGroup backgrounds={backgrounds} />
   <slot />
 </div>

package/src/components/GridCell.astro

@@ -2,7 +2,6 @@
 import type {
   AnimationConfig,
   BackgroundConfig,
-  IEntify,
 } from "@rxdrag/website-lib-core";
 import BackgroundGroup from "./BackgroundGroup.astro";
 
@@ -12,13 +11,12 @@ interface Props {
   backgrounds?: BackgroundConfig[];
   //动效
   animation?: AnimationConfig;
-  rx: IEntify;
 }
 
-const { className, class: originalClass, backgrounds, rx } = Astro.props;
+const { className, class: originalClass, backgrounds } = Astro.props;
 ---
 
 <div class:list={["w-full, h-full flex flex-col", className, originalClass]}>
-  <BackgroundGroup backgrounds={backgrounds} rx={rx} />
+  <BackgroundGroup backgrounds={backgrounds} />
   <slot />
 </div>

package/src/components/Section.astro

@@ -2,7 +2,6 @@
 import type {
   AnimationConfig,
   BackgroundConfig,
-  IEntify,
 } from "@rxdrag/website-lib-core";
 import BackgroundGroup from "./BackgroundGroup.astro";
 import Container from "./Container.astro";
@@ -19,7 +18,6 @@ interface Props {
   //动效
   animation?: AnimationConfig;
   disableContainer?: boolean;
-  rx: IEntify;
 }
 
 const {
@@ -28,12 +26,11 @@ const {
   backgrounds,
   disableContainer,
   class: originalClass,
-  rx,
 } = Astro.props;
 ---
 
 <section class:list={["section-block", className, originalClass]}>
-  <BackgroundGroup rx={rx} backgrounds={backgrounds} />
+  <BackgroundGroup backgrounds={backgrounds} />
   {
     disableContainer ? (
       <slot />

package/src/components/Video.astro

@@ -1,5 +1,10 @@
 ---
-import { ReactVideoPlayer, type IEntify } from "@rxdrag/website-lib-core";
+import {
+  Entify,
+  ReactVideoPlayer,
+  type Locals,
+} from "@rxdrag/website-lib-core";
+const { env } = Astro.locals as Locals;
 
 interface Props {
   videoRef?: string;
@@ -17,17 +22,17 @@ interface Props {
     ctaButton?: string;
     overlayReplayButton?: string;
   };
-  rx: IEntify;
 }
 
 const {
-  rx,
   videoRef,
   posterRef,
   endTitle = "Contact Us Now",
   classNames = {},
 } = Astro.props;
 
+const rx = Entify.getInstance(env);
+
 // 获取媒体数据（增加 rx 为空时的保护）
 const media = rx ? await rx.getMedia(videoRef) : undefined;
 const poster = rx ? await rx.getMedia(posterRef) : undefined;