@rxdrag/website-lib 0.0.70 → 0.0.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -24,18 +24,18 @@
     "eslint": "^7.32.0",
     "gsap": "^3.12.7",
     "typescript": "^5",
-    "@rxdrag/rxcms-models": "0.3.91",
+    "@rxdrag/entify-hooks": "0.2.73",
+    "@rxdrag/eslint-config-custom": "0.2.12",
     "@rxdrag/slate-preview": "1.2.58",
-    "@rxdrag/entify-hooks": "0.2.72",
-    "@rxdrag/tsconfig": "0.2.0",
-    "@rxdrag/eslint-config-custom": "0.2.12"
+    "@rxdrag/rxcms-models": "0.3.92",
+    "@rxdrag/tsconfig": "0.2.0"
   },
   "dependencies": {
     "clsx": "^2.1.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "@rxdrag/rxcms-models": "0.3.91",
-    "@rxdrag/website-lib-core": "0.0.69"
+    "@rxdrag/website-lib-core": "0.0.70",
+    "@rxdrag/rxcms-models": "0.3.92"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

package/src/components/Background.astro

@@ -16,7 +16,7 @@ export interface Props {
   defaultClass?: string;
 }
 
-const { env } = Astro.locals as Locals;
+const { env, imageSizes } = Astro.locals as Locals;
 
 const { background, defaultClass = "absolute w-full h-full object-cover" } =
   Astro.props;
@@ -32,7 +32,7 @@ const mediaRef =
 const posterRef =
   background.type === "video" ? background.posterRef : undefined;
 
-const rx = Entify.getInstance(env);
+const rx = Entify.getInstance(env, imageSizes);
 
 // 获取媒体数据
 const media = rx ? await rx.getMedia(mediaRef) : undefined;

package/src/components/BackgroundGroup.astro

@@ -9,7 +9,7 @@ interface Props {
 const { backgrounds } = Astro.props;
 
 const defaultClass =
-  "absolute w-full h-full inset-0 object-cover object-center";
+  "absolute w-full h-full inset-0 object-cover";
 ---
 
 <Fragment>

package/src/components/Image.astro

@@ -1,13 +1,18 @@
 ---
-import type { FileRef, Media } from "@rxdrag/rxcms-models";
+import { Entify, type ImageProps, type Locals } from "@rxdrag/website-lib-core";
+const { env, imageSizes } = Astro.locals as Locals;
 
-interface Props extends Omit<astroHTML.JSX.ImgHTMLAttributes, "src" | "class"> {
-  showField?: keyof FileRef;
-  image?: Media;
-  className?: string;
-}
+interface Props extends ImageProps {}
 
-const { showField = "url", image, className, ...props } = Astro.props;
+const { mediaRef, fileField, resize, className, ...props } = Astro.props;
+
+const rx = Entify.getInstance(env, imageSizes);
+
+const media = rx ? await rx.getMedia(mediaRef, fileField, resize) : undefined;
 ---
 
-<img src={image?.file?.[showField] || ""} class={className} {...props} />
+<img
+  src={fileField ? media?.file?.[fileField] : media?.file?.original || ""}
+  class={className}
+  {...props}
+/>

package/src/components/Video.astro

@@ -4,7 +4,7 @@ import {
   ReactVideoPlayer,
   type Locals,
 } from "@rxdrag/website-lib-core";
-const { env } = Astro.locals as Locals;
+const { env, imageSizes } = Astro.locals as Locals;
 
 interface Props {
   videoRef?: string;
@@ -31,7 +31,7 @@ const {
   classNames = {},
 } = Astro.props;
 
-const rx = Entify.getInstance(env);
+const rx = Entify.getInstance(env, imageSizes);
 
 // 获取媒体数据（增加 rx 为空时的保护）
 const media = rx ? await rx.getMedia(videoRef) : undefined;