@brftech/filex-core 0.7.3 → 0.7.4

package/dist/index.d.ts

@@ -48,6 +48,9 @@ declare type __VLS_Props_11 = {
     viewMode?: ViewMode;
     /** ui-fix — authenticated thumb resolver, forwarded to grid/gallery. */
     thumbSrc?: (n: FileNode) => string | null;
+    /** ui-fix — mirror the main panel's virtual `.trash` row at storage root
+     *  so both split panes list identical rows (no row-offset). Defaults on. */
+    trashVisible?: boolean;
 };
 
 declare type __VLS_Props_12 = {
@@ -856,9 +859,11 @@ virtualRows?: () => FileNode[];
 active?: boolean;
 viewMode?: ViewMode;
 thumbSrc?: (n: FileNode) => string | null;
+trashVisible?: boolean;
 }> & Readonly<{
 onClose?: (() => any) | undefined;
 onNavigate?: ((path: string) => any) | undefined;
+"onOpen-trash"?: (() => any) | undefined;
 onActivate?: (() => any) | undefined;
 "onOpen-tab"?: ((path: string) => any) | undefined;
 onTransfer?: ((p: {
@@ -877,6 +882,7 @@ getPath: () => string;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {} & {
 close: () => any;
 navigate: (path: string) => any;
+"open-trash": () => any;
 activate: () => any;
 "open-tab": (path: string) => any;
 transfer: (p: {
@@ -906,9 +912,11 @@ virtualRows?: () => FileNode[];
 active?: boolean;
 viewMode?: ViewMode;
 thumbSrc?: (n: FileNode) => string | null;
+trashVisible?: boolean;
 }> & Readonly<{
 onClose?: (() => any) | undefined;
 onNavigate?: ((path: string) => any) | undefined;
+"onOpen-trash"?: (() => any) | undefined;
 onActivate?: (() => any) | undefined;
 "onOpen-tab"?: ((path: string) => any) | undefined;
 onTransfer?: ((p: {
@@ -1373,6 +1381,7 @@ getPath: typeof getPath;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {} & {
 close: () => any;
 navigate: (path: string) => any;
+"open-trash": () => any;
 activate: () => any;
 "open-tab": (path: string) => any;
 transfer: (p: {
@@ -1384,6 +1393,7 @@ context: (node: FileNode | null, ev: MouseEvent) => any;
 }, string, PublicProps, Readonly<__VLS_Props_11> & Readonly<{
 onClose?: (() => any) | undefined;
 onNavigate?: ((path: string) => any) | undefined;
+"onOpen-trash"?: (() => any) | undefined;
 onActivate?: (() => any) | undefined;
 "onOpen-tab"?: ((path: string) => any) | undefined;
 onTransfer?: ((p: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brftech/filex-core",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "filex core — Vue 3 source of truth for the filex file manager (FileExplorer SFC + composables + types)",
   "type": "module",
   "main": "./dist/filex-core.umd.cjs",

package/src/FileExplorer.vue

@@ -86,6 +86,15 @@ import {
 } from './lib/e2ecrypto';
 /* /wiring:e2 */
 
+/* ui-fix — listing helpers shared with SecondaryPane (single source: the
+   internal-entry filter + virtual `.trash` row must be identical in both
+   panes or split view shows mismatched rows). */
+import {
+  filterInternalEntries,
+  injectTrashRow,
+  hydrateTrashRow as hydrateTrashRowShared,
+} from './lib/listing';
+
 import NewFolderModal from './modals/NewFolderModal.vue';
 import RenameModal from './modals/RenameModal.vue';
 import DeleteConfirmModal from './modals/DeleteConfirmModal.vue';
@@ -707,33 +716,11 @@ async function load(path?: string) {
        subtree; '' resets on every plain folder. Drives the lock screen. */
     e2eRoot.value = typeof resp.e2e_root === 'string' ? resp.e2e_root : '';
     /* /wiring:e2 */
-    files.value = (resp.files || []).filter((f) => {
-      if (f.path.includes('.thumbs')) return false;
-      if (f.path.includes('.versions') || f.basename === '.versions') return false;
-      if (f.basename === '.trash') return false;
-      if (f.basename === '.keepdir') return false;
-      if (f.basename === E2E_MARKER_NAME) return false; /* wiring:e2 — marker gizli */
-      return true;
-    });
-    // Inject virtual `.trash` entry at root only.
-    const dirRel = stripAdapter(resp.dirname);
-    const inRoot = dirRel === 'fileman' || dirRel === '';
-    const isTrashListing = dirRel.startsWith('fileman/.trash');
-    const trashEntryEnabled = props.config.trashVisible !== false;
-    if (!isTrashListing && inRoot && trashEntryEnabled) {
-      files.value.unshift({
-        type: 'dir',
-        path: `${resp.adapter}://fileman/.trash`,
-        basename: '.trash',
-        extension: '',
-        storage: resp.adapter,
-        visibility: 'private',
-        size: 0,
-        file_size: 0,
-        mime_type: 'inode/directory',
-        extra_metadata: {},
-      } as unknown as FileNode);
-      void hydrateTrashRow(resp.adapter);
+    files.value = filterInternalEntries(resp.files);
+    // Inject virtual `.trash` entry at root only — shared helper so the
+    // split-view secondary pane shows the exact same row (no row-offset).
+    if (injectTrashRow(files.value, resp.adapter, resp.dirname, props.config.trashVisible !== false)) {
+      void hydrateTrashRowShared(files.value, resp.adapter, api);
     }
     // currentPath is the user-facing form: `s3-test/example` in
     // multi-storage mode, the bare relative path otherwise.
@@ -784,28 +771,7 @@ function leaveNotFound() {
   void load('');
 }
 
-// hydrateTrashRow — the virtual `.trash` row is synthesized with no size/date;
-// fill both from the backend trash listing (total bytes + newest deletion) so
-// the row reads like a real folder instead of "— / —". Best-effort and
-// non-blocking: the row appears immediately and updates when the listing lands.
-async function hydrateTrashRow(storage: string) {
-  try {
-    const { entries } = await api.listTrash(storage);
-    const row = files.value.find((f) => f.basename === '.trash');
-    if (!row) return;
-    let total = 0;
-    let newest = 0;
-    for (const e of entries) {
-      total += e.size || 0;
-      const ts = Date.parse(e.deleted_at);
-      if (!Number.isNaN(ts) && ts > newest) newest = ts;
-    }
-    row.size = total;
-    if (newest > 0) row.last_modified = newest;
-  } catch {
-    /* keep the bare row */
-  }
-}
+// (hydrateTrashRow moved to lib/listing.ts — shared with SecondaryPane.)
 
 // loadTrash — show the backend trash (soft-deleted nodes) as a flat listing.
 // Entered by opening the virtual `.trash` row. Each row keeps its node `id`
@@ -2616,6 +2582,12 @@ function closeSplit() {
 function onPaneNavigate(p: string) {
   tabsApi.setSplit({ ...(activeSplit.value ?? {}), path: p });
 }
+/* ui-fix — çöp kutusu satırı yan panelde açılınca: trash görünümü (geri
+ * yükleme aksiyonlarıyla) ana panele aittir → ana paneli aktif edip aç. */
+function onPaneOpenTrash() {
+  activePane.value = 'main';
+  void loadTrash();
+}
 /* ui-fix — pane'in KENDİ görünüm modu: split açılırken ana panelinkini
  * devralır, sonrasında bağımsız. Toolbar'ın görünüm değiştiricisi ve palet
  * toggle'ı AKTİF panele yazar (Burak: "B tıklıyken ikon değiştir dersem
@@ -3349,12 +3321,14 @@ async function submitEncryptedFolder(payload: { name: string; password: string }
       :active="paneIsActive"
       :view-mode="paneViewMode /* ui-fix */"
       :thumb-src="thumbs.src /* ui-fix */"
+      :trash-visible="config.trashVisible !== false /* ui-fix — çöp satırı simetrisi */"
       @navigate="onPaneNavigate"
       @activate="activePane = 'split'"
       @close="closeSplit"
       @open-tab="(p: string) => tabsApi.openTab(p, { viewMode: viewMode, background: true })"
       @transfer="onPaneTransfer"
       @context="onPaneContext /* ui-fix — yan panel sağ-tık menüsü */"
+      @open-trash="onPaneOpenTrash /* ui-fix — çöp kutusu ana panelde açılır */"
     />
     <!-- /wiring:d1 -->
 

package/src/components/SecondaryPane.vue

@@ -21,6 +21,7 @@ import type { FileApi } from '../composables/useFileApi';
 import type { FileNode, ViewMode } from '../types/FileNode';
 import type { LocaleCode } from '../types/ExplorerConfig';
 import { useLocale } from '../composables/useLocale';
+import { filterInternalEntries, injectTrashRow, hydrateTrashRow } from '../lib/listing';
 import ListView from './ListView.vue';
 import GridView from './GridView.vue';
 import GalleryView from './GalleryView.vue';
@@ -57,6 +58,9 @@ const props = defineProps<{
   viewMode?: ViewMode;
   /** ui-fix — authenticated thumb resolver, forwarded to grid/gallery. */
   thumbSrc?: (n: FileNode) => string | null;
+  /** ui-fix — mirror the main panel's virtual `.trash` row at storage root
+   *  so both split panes list identical rows (no row-offset). Defaults on. */
+  trashVisible?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -68,6 +72,9 @@ const emit = defineEmits<{
   /* ui-fix — yan panelde sağ-tık: menü ana bileşende (FileExplorer) açılır.
    * node=null → boş alana sağ-tık (seçimsiz, yalnız Yapıştır). */
   (e: 'context', node: FileNode | null, ev: MouseEvent): void;
+  /* ui-fix — çöp kutusu satırı açıldığında: trash görünümü ana panele aittir
+   * (geri yükleme aksiyonlarıyla), host loadTrash() ile açar. */
+  (e: 'open-trash'): void;
 }>();
 
 const { t } = useLocale(() => props.locale);
@@ -101,14 +108,12 @@ async function loadPane(target?: string): Promise<void> {
       return;
     }
     const resp = await props.api.index(props.qualify(requested));
-    // Same internal-entry filter as the main listing.
-    files.value = (resp.files || []).filter((f) => {
-      if (f.path.includes('.thumbs')) return false;
-      if (f.path.includes('.versions') || f.basename === '.versions') return false;
-      if (f.basename === '.trash') return false;
-      if (f.basename === '.keepdir') return false;
-      return true;
-    });
+    // Same internal-entry filter + virtual `.trash` row as the main panel
+    // (shared helpers → both split panes list identical rows, no offset).
+    files.value = filterInternalEntries(resp.files);
+    if (injectTrashRow(files.value, resp.adapter, resp.dirname, props.trashVisible !== false)) {
+      void hydrateTrashRow(files.value, resp.adapter, props.api);
+    }
     path.value = props.toUser(resp.dirname);
     selected.value = new Set();
     emit('navigate', path.value);
@@ -204,6 +209,13 @@ function onViewDropInto(target: FileNode, ev: DragEvent) {
 
 function onRowDbl(n: FileNode) {
   if (n.type !== 'dir') return;
+  // The virtual `.trash` row opens the backend trash listing (restore
+  // actions) — that view lives in the main panel; let the host open it.
+  if (n.basename === '.trash') {
+    emit('activate');
+    emit('open-trash');
+    return;
+  }
   void loadPane(isStorageRow(n) ? n.path : props.toUser(n.path));
 }
 
@@ -217,7 +229,7 @@ function clearSelection() {
 
 function onRowDragStart(n: FileNode, ev: DragEvent) {
   if (!ev.dataTransfer) return;
-  if (isStorageRow(n) || atVirtualRoot.value) {
+  if (isStorageRow(n) || atVirtualRoot.value || n.basename === '.trash') {
     ev.preventDefault();
     return;
   }

package/src/lib/listing.ts

@@ -0,0 +1,105 @@
+/**
+ * listing.ts — shared listing helpers used by BOTH the main panel
+ * (FileExplorer.load) and the split-view secondary panel
+ * (SecondaryPane.loadPane). SINGLE SOURCE so the two panes can never
+ * drift apart: the internal-entry filter and the virtual `.trash` row
+ * must be identical in both, otherwise split view shows mismatched rows
+ * (the trash row missing on one side → visible row-offset).
+ */
+import type { FileNode } from '../types/FileNode';
+import { E2E_MARKER_NAME } from './e2ecrypto';
+
+/** Adapter-strip: `s3-test://fileman/x` → `fileman/x`. */
+export function stripAdapter(p: string): string {
+  const idx = p.indexOf('://');
+  return idx === -1 ? p : p.slice(idx + 3);
+}
+
+/**
+ * Hide system/internal entries the user must never see as files:
+ * thumbnails, version history, the soft-delete store, keepdir markers
+ * and the E2E marker. Shared by both panes' listing filters.
+ */
+export function filterInternalEntries(files: FileNode[]): FileNode[] {
+  return (files || []).filter((f) => {
+    if (f.path.includes('.thumbs')) return false;
+    if (f.path.includes('.versions') || f.basename === '.versions') return false;
+    if (f.basename === '.trash') return false;
+    if (f.basename === '.keepdir') return false;
+    if (f.basename === E2E_MARKER_NAME) return false;
+    return true;
+  });
+}
+
+/** True when `dirname` (adapter-qualified) is the storage root, where the
+ *  virtual trash row belongs. */
+export function isStorageRootDir(dirname: string): boolean {
+  const rel = stripAdapter(dirname);
+  return rel === 'fileman' || rel === '';
+}
+
+/** True when the listing IS the trash view (don't inject the row into itself). */
+export function isTrashListing(dirname: string): boolean {
+  return stripAdapter(dirname).startsWith('fileman/.trash');
+}
+
+/** The synthetic `.trash` row shown at storage root — rendered as
+ *  "Çöp Kutusu" / "Trash" via the `.trash` basename → locale mapping. */
+export function makeTrashRow(adapter: string): FileNode {
+  return {
+    type: 'dir',
+    path: `${adapter}://fileman/.trash`,
+    basename: '.trash',
+    extension: '',
+    storage: adapter,
+    visibility: 'private',
+    size: 0,
+    file_size: 0,
+    mime_type: 'inode/directory',
+    extra_metadata: {},
+  } as unknown as FileNode;
+}
+
+/**
+ * Inject the virtual `.trash` row at the front of a root listing when
+ * enabled. Returns true if a row was added (so the caller can hydrate
+ * it). Mutates `files` in place. Single source for both panes.
+ */
+export function injectTrashRow(
+  files: FileNode[],
+  adapter: string,
+  dirname: string,
+  trashVisible: boolean,
+): boolean {
+  if (!trashVisible) return false;
+  if (isTrashListing(dirname)) return false;
+  if (!isStorageRootDir(dirname)) return false;
+  files.unshift(makeTrashRow(adapter));
+  return true;
+}
+
+/** Best-effort fill of the trash row's size (total bytes) + date (newest
+ *  deletion) from the backend trash listing, so it reads like a real
+ *  folder instead of "— / —". Non-blocking; mutates the row in place. */
+export async function hydrateTrashRow(
+  files: FileNode[],
+  storage: string,
+  api: { listTrash: (s?: string) => Promise<{ entries: Array<{ size?: number; deleted_at: string }> }> },
+): Promise<void> {
+  try {
+    const { entries } = await api.listTrash(storage);
+    const row = files.find((f) => f.basename === '.trash');
+    if (!row) return;
+    let total = 0;
+    let newest = 0;
+    for (const e of entries) {
+      total += e.size || 0;
+      const ts = Date.parse(e.deleted_at);
+      if (!Number.isNaN(ts) && ts > newest) newest = ts;
+    }
+    row.size = total;
+    if (newest > 0) row.last_modified = newest;
+  } catch {
+    /* keep the bare row */
+  }
+}