@ray-js/ipc-player-integration 0.0.49-beta.1 → 0.0.49-beta.3

package/lib/ui/bottomLeftContent.js

@@ -11,6 +11,9 @@ import { pauseTimeToHideAllComponent, startTimeToHideAllComponent } from './cons
 
 // 用唯一 className 在 createSelectorQuery 中区分多个实例，避免互相干扰
 let scrollClsSeq = 0;
+
+// 竖屏下单个 widget 的占位宽度：icon 22px(--iconPlayerSize) + .bottom-left-item-container 左右各 12px
+const VERTICAL_WIDGET_WIDTH = 46;
 const BottomLeftContent = _ref => {
   let {
     ctx,
@@ -215,8 +218,11 @@ const BottomLeftContent = _ref => {
   // 竖屏 button 模式给 ScrollView 右侧留一条较窄的“箭头槽”：只裁掉内容最右一小段，
   // 箭头压住最后一个元素的少量边缘（不完全遮挡），整体更贴近内容
   const arrowGutter = isButtonHint && screenType === 'vertical' ? 12 : 0;
-  // 箭头贴右边缘放置（竖屏 4px / 横屏 6px），不再随 gutter 居中
-  const hintRight = arrowGutter > 0 ? 4 : 6;
+  // 竖屏再额外收窄一个 widget 的宽度，让可滑动区域整体左缩一格
+  const verticalShrink = screenType === 'vertical' ? VERTICAL_WIDGET_WIDTH : 0;
+  const scrollShrink = arrowGutter + verticalShrink;
+  // 箭头贴滚动可视区右边缘放置（竖屏 4px / 横屏 6px），随收窄量一起左移
+  const hintRight = (arrowGutter > 0 ? 4 : 6) + verticalShrink;
   return /*#__PURE__*/React.createElement(CoverView, {
     className: clsx('ipc-player-bottom-left-content-wrap'),
     style: {
@@ -280,7 +286,7 @@ const BottomLeftContent = _ref => {
       paddingBottom: `${paddingBottomPx}px`,
       paddingLeft: `${paddingLeftPx}px`,
       paddingRight: `${paddingRightPx}px`,
-      width: arrowGutter > 0 ? `calc(100% - ${arrowGutter}px)` : '100%',
+      width: scrollShrink > 0 ? `calc(100% - ${scrollShrink}px)` : '100%',
       height: `${containerHeight}px`,
       marginTop: showBadge ? '-2px' : 0,
       whiteSpace: 'nowrap'

package/lib/ui/ui.js

@@ -577,25 +577,18 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       } = sizeData;
 
       // 折叠屏展开/收起、pad 多窗口拖拽等场景，需要重新计算并同步
-      const small = computeIsSmallScreen();
-      setIsSmallScreen(small);
-
-      //  针对pad 和折叠屏展开的情况暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
-      if (small) {
-        setScreenType('vertical');
-      } else {
-        setScreenType(type === 'landscape' ? 'full' : 'vertical');
-        if (type === 'landscape') {
-          // 记录切换横屏前的竖屏全屏状态
-          prevVerticalFullLayoutRef.current = isVerticalFullLayout;
-          // 横屏时重置竖屏全屏状态
-          updateAtom(instance.isVerticalFullLayout, false);
-        } else if (!instance.multiCameraCtx.isSupport) {
-          // 单目设备从横屏切回竖屏时，恢复之前的竖屏全屏状态
-          updateAtom(instance.isVerticalFullLayout, prevVerticalFullLayoutRef.current);
-        }
-        triggerEvent(showAllComponent);
+      setIsSmallScreen(computeIsSmallScreen());
+      setScreenType(type === 'landscape' ? 'full' : 'vertical');
+      if (type === 'landscape') {
+        // 记录切换横屏前的竖屏全屏状态
+        prevVerticalFullLayoutRef.current = isVerticalFullLayout;
+        // 横屏时重置竖屏全屏状态
+        updateAtom(instance.isVerticalFullLayout, false);
+      } else if (!instance.multiCameraCtx.isSupport) {
+        // 单目设备从横屏切回竖屏时，恢复之前的竖屏全屏状态
+        updateAtom(instance.isVerticalFullLayout, prevVerticalFullLayoutRef.current);
       }
+      triggerEvent(showAllComponent);
       // 横屏（fill/standard）与竖屏均统一调整为 1 倍缩放，保证画面完整展示
       setScaleMultiple(1);
     } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.49-beta.1",
+  "version": "0.0.49-beta.3",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [