@@ -107,6 +107,18 @@ function makeSession(frame?: ReturnType<typeof makeFrame>) {
107107 } ;
108108}
109109
110+ function fileChooserElement ( accept : string ) {
111+ return {
112+ getAttribute : async ( ) => accept ,
113+ evaluate : ( probe : ( element : { ownerDocument : unknown } ) => boolean ) =>
114+ Promise . resolve (
115+ probe ( {
116+ ownerDocument : ( globalThis as typeof globalThis & { document ?: unknown } ) . document ,
117+ } ) ,
118+ ) ,
119+ } ;
120+ }
121+
110122function makeContext ( onClose ?: ( context : BrowserContext ) => void ) {
111123 const events = new NodeEvents . EventEmitter ( ) ;
112124 const nativeFileChooser = vi . fn ( ) ;
@@ -127,7 +139,7 @@ function makeContext(onClose?: (context: BrowserContext) => void) {
127139 if (
128140 ! events . emit ( "filechooser" , {
129141 isMultiple : ( ) => false ,
130- element : ( ) => ( { getAttribute : async ( ) => ".csv" } ) ,
142+ element : ( ) => fileChooserElement ( ".csv" ) ,
131143 setFiles : setChooserFiles ,
132144 } )
133145 ) {
@@ -1385,7 +1397,7 @@ it.live("a page's file picker goes to the controller and takes its uploaded file
13851397 const setFiles = vi . fn ( async ( _files : unknown ) => { } ) ;
13861398 page . emit ( "filechooser" , {
13871399 isMultiple : ( ) => false ,
1388- element : ( ) => ( { getAttribute : async ( ) => ".csv" } ) ,
1400+ element : ( ) => fileChooserElement ( ".csv" ) ,
13891401 setFiles,
13901402 } ) ;
13911403 let offered = yield * Queue . take ( viewer . output ) ;
@@ -1410,6 +1422,163 @@ it.live("a page's file picker goes to the controller and takes its uploaded file
14101422 ) . pipe ( Effect . provide ( layer ) ) ,
14111423) ;
14121424
1425+ it . live ( "a file picker from a detached input stays open across its own DCL" , ( ) =>
1426+ Effect . scoped (
1427+ Effect . gen ( function * ( ) {
1428+ const { browser, tabId } = yield * ready ;
1429+ const page = contexts [ 0 ] ! . page ;
1430+ const pageDocument = { } ;
1431+ vi . stubGlobal ( "document" , pageDocument ) ;
1432+ yield * Effect . addFinalizer ( ( ) => Effect . sync ( ( ) => vi . unstubAllGlobals ( ) ) ) ;
1433+ const detachedInput = { isConnected : false , ownerDocument : pageDocument } ;
1434+ const dclProbe = Promise . withResolvers < boolean > ( ) ;
1435+ const dclProbeStarted = Promise . withResolvers < void > ( ) ;
1436+ const dclProbeFinished = Promise . withResolvers < void > ( ) ;
1437+ let probeCount = 0 ;
1438+ const viewer = yield * browser . attachViewer ( viewerInput ( tabId , true ) ) ;
1439+ yield * viewer . input ( { type : "takeControl" } ) ;
1440+ page . emit ( "filechooser" , {
1441+ isMultiple : ( ) => false ,
1442+ element : ( ) => ( {
1443+ getAttribute : async ( ) => "" ,
1444+ evaluate : ( probe : ( element : typeof detachedInput ) => boolean ) => {
1445+ probeCount ++ ;
1446+ if ( probeCount === 1 ) return Promise . resolve ( probe ( detachedInput ) ) ;
1447+ dclProbeStarted . resolve ( ) ;
1448+ return dclProbe . promise . then ( ( current ) => {
1449+ const result = probe ( detachedInput ) ;
1450+ dclProbeFinished . resolve ( ) ;
1451+ return current && result ;
1452+ } ) ;
1453+ } ,
1454+ } ) ,
1455+ setFiles : vi . fn ( async ( _files : unknown ) => { } ) ,
1456+ } ) ;
1457+ let offered = yield * Queue . take ( viewer . output ) ;
1458+ while ( offered . _tag !== "fileChooser" ) offered = yield * Queue . take ( viewer . output ) ;
1459+
1460+ page . emit ( "domcontentloaded" ) ;
1461+ yield * Effect . promise ( ( ) => dclProbeStarted . promise ) ;
1462+ dclProbe . resolve ( true ) ;
1463+ yield * Effect . promise ( ( ) => dclProbeFinished . promise ) ;
1464+ yield * viewer . input ( { type : "releaseControl" } ) ;
1465+ let closedAfterDcl = false ;
1466+ let control = yield * Queue . take ( viewer . output ) ;
1467+ while ( control . _tag !== "control" || control . controller === "you" ) {
1468+ if ( control . _tag === "fileChooserClosed" ) closedAfterDcl = true ;
1469+ control = yield * Queue . take ( viewer . output ) ;
1470+ }
1471+ expect ( closedAfterDcl ) . toBe ( false ) ;
1472+ yield * viewer . input ( { type : "takeControl" } ) ;
1473+ let restoredControl = yield * Queue . take ( viewer . output ) ;
1474+ while ( restoredControl . _tag !== "control" || restoredControl . controller !== "you" ) {
1475+ restoredControl = yield * Queue . take ( viewer . output ) ;
1476+ }
1477+
1478+ expect (
1479+ yield * browser . answerFileChooser ( {
1480+ threadId : scope . thread . threadId ,
1481+ tabId,
1482+ chooserId : offered . id ,
1483+ files : [ { name : "a.csv" , mimeType : "text/csv" , buffer : Buffer . from ( "a" ) } ] ,
1484+ } ) ,
1485+ ) . toBe ( true ) ;
1486+ } ) ,
1487+ ) . pipe ( Effect . provide ( layer ) ) ,
1488+ ) ;
1489+
1490+ it . live ( "a file picker closes when its page is replaced by a new document" , ( ) =>
1491+ Effect . scoped (
1492+ Effect . gen ( function * ( ) {
1493+ const { browser, tabId } = yield * ready ;
1494+ const page = contexts [ 0 ] ! . page ;
1495+ const viewer = yield * browser . attachViewer ( viewerInput ( tabId , true ) ) ;
1496+ yield * viewer . input ( { type : "takeControl" } ) ;
1497+ const setFiles = vi . fn ( async ( _files : unknown ) => { } ) ;
1498+ const probeStarted = Promise . withResolvers < void > ( ) ;
1499+ const probeSettled = Promise . withResolvers < void > ( ) ;
1500+ let probeCount = 0 ;
1501+ page . emit ( "filechooser" , {
1502+ isMultiple : ( ) => false ,
1503+ element : ( ) => ( {
1504+ getAttribute : async ( ) => "" ,
1505+ evaluate : ( ) => {
1506+ probeCount ++ ;
1507+ if ( probeCount === 1 ) return Promise . resolve ( true ) ;
1508+ probeStarted . resolve ( ) ;
1509+ return Promise . reject ( new Error ( "Execution context was destroyed" ) ) . finally ( ( ) =>
1510+ probeSettled . resolve ( ) ,
1511+ ) ;
1512+ } ,
1513+ } ) ,
1514+ setFiles,
1515+ } ) ;
1516+ let offered = yield * Queue . take ( viewer . output ) ;
1517+ while ( offered . _tag !== "fileChooser" ) offered = yield * Queue . take ( viewer . output ) ;
1518+
1519+ page . emit ( "domcontentloaded" ) ;
1520+ yield * Effect . promise ( ( ) => probeStarted . promise ) ;
1521+ yield * Effect . promise ( ( ) => probeSettled . promise ) ;
1522+ let closed = yield * Queue . take ( viewer . output ) ;
1523+ while ( closed . _tag !== "fileChooserClosed" ) closed = yield * Queue . take ( viewer . output ) ;
1524+ expect ( closed . id ) . toBe ( offered . id ) ;
1525+ expect (
1526+ yield * browser . answerFileChooser ( {
1527+ threadId : scope . thread . threadId ,
1528+ tabId,
1529+ chooserId : offered . id ,
1530+ files : [ { name : "a.csv" , mimeType : "text/csv" , buffer : Buffer . from ( "a" ) } ] ,
1531+ } ) ,
1532+ ) . toBe ( false ) ;
1533+ expect ( setFiles ) . not . toHaveBeenCalled ( ) ;
1534+ } ) ,
1535+ ) . pipe ( Effect . provide ( layer ) ) ,
1536+ ) ;
1537+
1538+ it . live ( "a file picker is not offered after its document changes while reading accept" , ( ) =>
1539+ Effect . scoped (
1540+ Effect . gen ( function * ( ) {
1541+ const { broker, browser, tabId } = yield * ready ;
1542+ const page = contexts [ 0 ] ! . page ;
1543+ const viewer = yield * browser . attachViewer ( viewerInput ( tabId , true ) ) ;
1544+ yield * viewer . input ( { type : "takeControl" } ) ;
1545+ const accept = Promise . withResolvers < string | null > ( ) ;
1546+ const acceptRead = Promise . withResolvers < void > ( ) ;
1547+ const current = Promise . withResolvers < boolean > ( ) ;
1548+ const probeStarted = Promise . withResolvers < void > ( ) ;
1549+ page . emit ( "filechooser" , {
1550+ isMultiple : ( ) => false ,
1551+ element : ( ) => ( {
1552+ getAttribute : ( ) => {
1553+ acceptRead . resolve ( ) ;
1554+ return accept . promise ;
1555+ } ,
1556+ evaluate : ( ) => {
1557+ probeStarted . resolve ( ) ;
1558+ return current . promise ;
1559+ } ,
1560+ } ) ,
1561+ setFiles : vi . fn ( async ( _files : unknown ) => { } ) ,
1562+ } ) ;
1563+
1564+ yield * Effect . promise ( ( ) => acceptRead . promise ) ;
1565+ page . emit ( "domcontentloaded" ) ;
1566+ accept . resolve ( "" ) ;
1567+ yield * Effect . promise ( ( ) => accept . promise ) ;
1568+ yield * Effect . promise ( ( ) => probeStarted . promise ) ;
1569+ current . resolve ( false ) ;
1570+ yield * Effect . promise ( ( ) => current . promise ) ;
1571+ const status = yield * broker . invoke < PreviewAutomationStatus > ( {
1572+ scope,
1573+ tabId,
1574+ operation : "status" ,
1575+ input : { } ,
1576+ } ) ;
1577+ expect ( status . fileChooser ) . toBeNull ( ) ;
1578+ } ) ,
1579+ ) . pipe ( Effect . provide ( layer ) ) ,
1580+ ) ;
1581+
14131582it . live ( "only the current controller can answer a file picker" , ( ) =>
14141583 Effect . scoped (
14151584 Effect . gen ( function * ( ) {
@@ -1419,7 +1588,7 @@ it.live("only the current controller can answer a file picker", () =>
14191588 const setFiles = vi . fn ( async ( _files : unknown ) => { } ) ;
14201589 contexts [ 0 ] ! . page . emit ( "filechooser" , {
14211590 isMultiple : ( ) => false ,
1422- element : ( ) => ( { getAttribute : async ( ) => "" } ) ,
1591+ element : ( ) => fileChooserElement ( "" ) ,
14231592 setFiles,
14241593 } ) ;
14251594 let offered = yield * Queue . take ( first . output ) ;
@@ -1449,7 +1618,7 @@ it.live("a file picker replaces a stalled viewer backlog instead of being droppe
14491618 const accept = Promise . withResolvers < string > ( ) ;
14501619 page . emit ( "filechooser" , {
14511620 isMultiple : ( ) => false ,
1452- element : ( ) => ( { getAttribute : ( ) => accept . promise } ) ,
1621+ element : ( ) => ( { ... fileChooserElement ( "" ) , getAttribute : ( ) => accept . promise } ) ,
14531622 setFiles : async ( ) => { } ,
14541623 } ) ;
14551624 yield * Queue . clear ( viewer . output ) ;
@@ -1562,7 +1731,7 @@ it.live("an agent answers the page's file picker or sets files on a file input",
15621731 const setFiles = vi . fn ( async ( _files : unknown ) => { } ) ;
15631732 page . emit ( "filechooser" , {
15641733 isMultiple : ( ) => false ,
1565- element : ( ) => ( { getAttribute : async ( ) => ".csv" } ) ,
1734+ element : ( ) => fileChooserElement ( ".csv" ) ,
15661735 setFiles,
15671736 } ) ;
15681737 const status = broker . invoke < PreviewAutomationStatus > ( {
0 commit comments