From fe6b4228b058ebe1193de5a89276b98af573d790 Mon Sep 17 00:00:00 2001 From: Aviral Shukla Date: Thu, 19 Nov 2026 15:23:36 +0530 Subject: [PATCH] fix: pin wallpaper picker actions in footer --- dist/gui-experimental.cjs | 24 +++++----- src/command.ts | 28 +++++------- src/gui.tsx | 18 +++++++- src/i18n/en.ts | 1 + src/model.test.ts | 48 +++++++++++--------- src/model.ts | 4 ++ src/picker.tsx | 94 +++++++++++++++++++++++++++++++++++++++ src/settings.css | 69 +++++++++++++++++++++++++++- src/settings.tsx | 6 +-- 9 files changed, 237 insertions(+), 55 deletions(-) create mode 100644 src/picker.tsx diff --git a/dist/gui-experimental.cjs b/dist/gui-experimental.cjs index a15e8e0..0334cf6 100644 --- a/dist/gui-experimental.cjs +++ b/dist/gui-experimental.cjs @@ -1,6 +1,6 @@ -"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("solid-js/web"),q=require("@opencode/plugin/gui"),g=require("solid-js"),p=require("effect"),se=require("solid-js/store"),N=require("node:fs/promises"),U=require("node:path"),ye=require("node:os"),D=8*1024*1024,Se=p.Schema.Struct({id:p.Schema.String,title:p.Schema.String,version:p.Schema.String}),ke=p.Schema.Struct({id:p.Schema.String,version:p.Schema.String}),oe=q.Ipc.define({id:"wallpaper.catalog.v5",state:p.Schema.Struct({folder:p.Schema.String,folderLabel:p.Schema.optional(p.Schema.String),ready:p.Schema.Boolean,images:p.Schema.Array(Se),error:p.Schema.String}),methods:{refresh:{output:p.Schema.Boolean},setFolder:{input:p.Schema.NonEmptyString,output:p.Schema.Boolean},read:{input:ke,output:p.Schema.String}}}),xe=/^[A-Za-z0-9+/]+={0,2}$/,$e=new Set(["image/png","image/jpeg","image/webp"]),ce=p.Schema.String.check(p.Schema.isPattern(/^(?:data:image\/(?:png|jpeg|webp);base64,[A-Za-z0-9+/]+={0,2})?$/),p.Schema.isMaxLength(23+4*Math.ceil(D/3)),p.Schema.makeFilter(e=>{const t=Q(e);return!e||t.length%4===0&&pe(t)<=D}));function Ce(e){if(!$e.has(e.type))throw new Error("image.typeError");if(e.size===0||e.size>D)throw new Error("image.sizeError")}function de(e){const t=/^data:(image\/(?:png|jpeg|webp|svg\+xml))(;base64)?,([\s\S]+)$/.exec(e);if(!t)throw new Error("image.decodeError");const[,r,l,a]=t;if(l&&(a.length%4!==0||pe(a)>D||!xe.test(a)))throw new Error("image.decodeError");if(!l&&r!=="image/svg+xml")throw new Error("image.decodeError");try{const o=new Blob([l?Uint8Array.from(atob(a),s=>s.charCodeAt(0)):decodeURIComponent(a)],{type:r});if(o.size===0||o.size>D)throw new Error("image.decodeError");return o}catch(o){throw new Error("image.decodeError",{cause:o})}}async function ee(e,t){t.throwIfAborted();const r=new Image,l=()=>{r.src=""};t.addEventListener("abort",l,{once:!0});try{return r.src=e,await r.decode(),t.throwIfAborted(),r}catch(a){throw t.throwIfAborted(),new Error("image.decodeError",{cause:a})}finally{t.removeEventListener("abort",l)}}async function Ee(e,t){t.throwIfAborted();const r=URL.createObjectURL(de(e));try{const l=await ee(r,t),a=document.createElement("canvas"),o=Math.min(1,320/l.naturalWidth,200/l.naturalHeight);a.width=Math.max(1,Math.round(l.naturalWidth*o)),a.height=Math.max(1,Math.round(l.naturalHeight*o));const s=a.getContext("2d");if(!s)throw new Error("image.decodeError");s.drawImage(l,0,0,a.width,a.height);const d=await new Promise((c,b)=>{a.toBlob(x=>x?c(x):b(new Error("image.decodeError")),"image/png")});return t.throwIfAborted(),{blob:d,width:a.width,height:a.height}}finally{URL.revokeObjectURL(r)}}async function Ae(e,t){t.throwIfAborted(),Ce(e);const r=URL.createObjectURL(e);try{await ee(r,t)}finally{URL.revokeObjectURL(r)}return t.throwIfAborted(),new Promise((l,a)=>{const o=new FileReader,s=()=>o.abort(),d=()=>t.removeEventListener("abort",s);o.onload=()=>{d(),typeof o.result!="string"?a(new Error("image.readError")):l(o.result)},o.onerror=()=>{d(),a(new Error("image.readError"))},o.onabort=()=>{d(),a(t.reason)},t.addEventListener("abort",s,{once:!0});try{o.readAsDataURL(e)}catch(c){d(),a(new Error("image.readError",{cause:c}))}})}function X(e,t){return e.startsWith("image.")?t(e):`${t("image.readError")} ${e}`}function Q(e){return e.slice(e.indexOf(",")+1)}function pe(e){return e.length/4*3-(e.endsWith("==")?2:e.endsWith("=")?1:0)}const O={tint:{min:0,max:100,initial:80},brightness:{min:25,max:150,initial:100}},ue=["tint","brightness"],_={min:5,max:86400,duration:60,transition:"fade"},Le=800,Re=p.Schema.Struct({id:p.Schema.String.check(p.Schema.isPattern(/^upload:.+$/)),name:p.Schema.String.check(p.Schema.isMinLength(1)),image:ce.check(p.Schema.isMinLength(1))}),Me=p.Schema.Struct({enabled:p.Schema.Boolean,preset:p.Schema.String,image:ce,imageName:p.Schema.optional(p.Schema.String),images:p.Schema.optional(p.Schema.Array(Re)),tint:p.Schema.optional(p.Schema.Int.check(p.Schema.isBetween({minimum:O.tint.min,maximum:O.tint.max}))),brightness:p.Schema.optional(p.Schema.Int.check(p.Schema.isBetween({minimum:O.brightness.min,maximum:O.brightness.max}))),fit:p.Schema.Literals(["cover","contain"]),slideshow:p.Schema.optional(p.Schema.Boolean),duration:p.Schema.optional(p.Schema.Int.check(p.Schema.isBetween({minimum:_.min,maximum:_.max}))),transition:p.Schema.optional(p.Schema.Literals(["none","fade"])),strength:p.Schema.Int.check(p.Schema.isBetween({minimum:5,maximum:45})),hidden:p.Schema.optional(p.Schema.Array(p.Schema.String))}),te={enabled:!1,preset:"",image:"",strength:100-O.tint.initial,fit:"cover"};function ge(e){return{tint:e.tint??100-e.strength,brightness:e.brightness??O.brightness.initial}}function V(e,t){return e?.id===t?.id&&e?.version===t?.version&&e?.image===t?.image}function Y(e,t){return t.find(r=>r.id===e.preset)}function me(e){const t=e.images??[];return e.image?[{id:"custom",name:e.imageName??"",image:e.image},...t]:t}function Ie(e=[],t=te,r=[]){const l=new Map(r.map(a=>[a.id,a]));return[...e,...me(t).map(a=>{const o=fe(a.name),s=l.get(a.id);return s?.image===a.image&&s.title===o?s:{id:a.id,title:o,version:"custom",image:a.image}})]}function ae(e){return e.id==="custom"||e.id.startsWith("upload:")}function ze(e,t,r){if(!ae(t)||(t.id==="custom"?(e.image="",delete e.imageName):e.images=e.images?.filter(a=>a.id!==t.id),e.preset!==t.id))return;const l=r[r.findIndex(a=>a.id===t.id)+1]??r.find(a=>a.id!==t.id);e.preset=l?.id??te.preset,l||(e.enabled=!1)}function he(e,t){e.enabled=t!=="off",t!=="off"&&(e.preset=t)}function G(e,t){return ae(e)?e.title||t("image.custom"):e.title}function ie(e,t,r){const l=J(e.name),a=Q(e.image??"");for(const o of me(t)){if(o.name&&J(o.name)===l)throw new Error("image.duplicateName");if(a&&a===Q(o.image))throw new Error("image.duplicateImage")}for(const o of r){const s=We(o.id);if(s&&J(s)===l)throw new Error("image.duplicateName")}}function We(e){if(!e.startsWith("file:"))return"";const t=e.slice(5);try{return decodeURIComponent(t)}catch{return t}}function J(e){return fe(e).normalize("NFC").toLowerCase()}function fe(e){const t=(e.split(/[\\/]/).at(-1)??e).trim();return t.replace(/\.(?:png|jpe?g|webp|svg)$/i,"")||t}function Ue(e,t,r,l,a){return{id:"choose",title:e.t("picker.title"),description:e.t("picker.description"),keywords:"wallpaper background image",slash:{name:"wallpaper"},async run(){if(e.signal.aborted||(await r(),e.signal.aborted))return;const o=await e.dialogs.select({title:e.t("picker.title"),placeholder:e.t("picker.search"),current:l(),options:[...t().map(s=>({title:G(s,e.t),value:s.id})),{title:e.t("picker.off"),value:"off"},{title:e.t("picker.settings"),value:"settings"}]});if(!(!o||e.signal.aborted)){if(o==="settings"){e.layout.settings("wallpaper");return}a(o)}}}}function we(e){return g.createMemo(()=>{const t=e();return t?{...t}:void 0},void 0,{equals:V})}function je(e,t,r=()=>0){const[l,a]=se.createStore({url:"",width:0,height:0,loading:!1,error:"",previous:void 0,transition:0});let o,s,d;const c=()=>{clearTimeout(d),d=void 0,s&&URL.revokeObjectURL(s.url),s=void 0,a({previous:void 0,transition:0})};g.onCleanup(()=>{c(),o&&URL.revokeObjectURL(o.url)});const b=we(e);return g.createEffect(()=>{const x=b(),$=new AbortController;let k="";if(g.onCleanup(()=>{$.abort(),k&&URL.revokeObjectURL(k),k=""}),a({loading:!!x,error:""}),!x){c(),o&&URL.revokeObjectURL(o.url),o=void 0,a({url:"",width:0,height:0});return}(async()=>{try{const u=x.image??await t(x,$.signal);$.signal.throwIfAborted(),k=URL.createObjectURL(de(u));const C=await ee(k,$.signal);$.signal.throwIfAborted(),c();const L=g.untrack(r);o&&L>0?s=o:o&&URL.revokeObjectURL(o.url),o={url:k,width:C.naturalWidth,height:C.naturalHeight},k="",a({...o,previous:s,transition:s?L:0,loading:!1,error:""}),s&&(d=setTimeout(c,L))}catch(u){k&&URL.revokeObjectURL(k),k="",$.signal.aborted||a({loading:!1,error:u instanceof Error?u.message:String(u)})}})()}),l}function _e(e,t){const[r,l]=se.createStore({url:"",width:0,height:0,loading:!1,error:""}),a=we(e);return g.createRenderEffect(()=>{const o=a(),s=new AbortController;let d;if(g.onCleanup(()=>{s.abort(),d?.release()}),l({url:"",width:0,height:0,loading:!!o,error:""}),!!o)try{if(d=t.acquire(o),d.value){l({...d.value,loading:!1});return}d.ready.then(c=>{s.signal.aborted||l({...c,loading:!1})},c=>{s.signal.aborted||l({loading:!1,error:c instanceof Error?c.message:String(c)})})}catch(c){l({loading:!1,error:c instanceof Error?c.message:String(c)})}}),r}function Pe(e){const t=new Map;return(r,l,a)=>{const o=t.get(r)??new Set,s=a.filter(d=>!d||o.has(d)?!1:(o.add(d),!0));t.set(r,o),s.length&&e.show({variant:"error",icon:"outline-photo",title:l,description:s.join(` +"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("solid-js/web"),O=require("@opencode/plugin/gui"),w=require("solid-js"),m=require("effect"),se=require("solid-js/store"),N=require("node:fs/promises"),j=require("node:path"),ve=require("node:os"),D=8*1024*1024,ye=m.Schema.Struct({id:m.Schema.String,title:m.Schema.String,version:m.Schema.String}),Se=m.Schema.Struct({id:m.Schema.String,version:m.Schema.String}),ne=O.Ipc.define({id:"wallpaper.catalog.v5",state:m.Schema.Struct({folder:m.Schema.String,folderLabel:m.Schema.optional(m.Schema.String),ready:m.Schema.Boolean,images:m.Schema.Array(ye),error:m.Schema.String}),methods:{refresh:{output:m.Schema.Boolean},setFolder:{input:m.Schema.NonEmptyString,output:m.Schema.Boolean},read:{input:Se,output:m.Schema.String}}}),ke=/^[A-Za-z0-9+/]+={0,2}$/,xe=new Set(["image/png","image/jpeg","image/webp"]),ce=m.Schema.String.check(m.Schema.isPattern(/^(?:data:image\/(?:png|jpeg|webp);base64,[A-Za-z0-9+/]+={0,2})?$/),m.Schema.isMaxLength(23+4*Math.ceil(D/3)),m.Schema.makeFilter(e=>{const t=Q(e);return!e||t.length%4===0&&pe(t)<=D}));function $e(e){if(!xe.has(e.type))throw new Error("image.typeError");if(e.size===0||e.size>D)throw new Error("image.sizeError")}function de(e){const t=/^data:(image\/(?:png|jpeg|webp|svg\+xml))(;base64)?,([\s\S]+)$/.exec(e);if(!t)throw new Error("image.decodeError");const[,o,c,r]=t;if(c&&(r.length%4!==0||pe(r)>D||!ke.test(r)))throw new Error("image.decodeError");if(!c&&o!=="image/svg+xml")throw new Error("image.decodeError");try{const n=new Blob([c?Uint8Array.from(atob(r),l=>l.charCodeAt(0)):decodeURIComponent(r)],{type:o});if(n.size===0||n.size>D)throw new Error("image.decodeError");return n}catch(n){throw new Error("image.decodeError",{cause:n})}}async function Y(e,t){t.throwIfAborted();const o=new Image,c=()=>{o.src=""};t.addEventListener("abort",c,{once:!0});try{return o.src=e,await o.decode(),t.throwIfAborted(),o}catch(r){throw t.throwIfAborted(),new Error("image.decodeError",{cause:r})}finally{t.removeEventListener("abort",c)}}async function Ce(e,t){t.throwIfAborted();const o=URL.createObjectURL(de(e));try{const c=await Y(o,t),r=document.createElement("canvas"),n=Math.min(1,320/c.naturalWidth,200/c.naturalHeight);r.width=Math.max(1,Math.round(c.naturalWidth*n)),r.height=Math.max(1,Math.round(c.naturalHeight*n));const l=r.getContext("2d");if(!l)throw new Error("image.decodeError");l.drawImage(c,0,0,r.width,r.height);const p=await new Promise((d,b)=>{r.toBlob(C=>C?d(C):b(new Error("image.decodeError")),"image/png")});return t.throwIfAborted(),{blob:p,width:r.width,height:r.height}}finally{URL.revokeObjectURL(o)}}async function Ee(e,t){t.throwIfAborted(),$e(e);const o=URL.createObjectURL(e);try{await Y(o,t)}finally{URL.revokeObjectURL(o)}return t.throwIfAborted(),new Promise((c,r)=>{const n=new FileReader,l=()=>n.abort(),p=()=>t.removeEventListener("abort",l);n.onload=()=>{p(),typeof n.result!="string"?r(new Error("image.readError")):c(n.result)},n.onerror=()=>{p(),r(new Error("image.readError"))},n.onabort=()=>{p(),r(t.reason)},t.addEventListener("abort",l,{once:!0});try{n.readAsDataURL(e)}catch(d){p(),r(new Error("image.readError",{cause:d}))}})}function Z(e,t){return e.startsWith("image.")?t(e):`${t("image.readError")} ${e}`}function Q(e){return e.slice(e.indexOf(",")+1)}function pe(e){return e.length/4*3-(e.endsWith("==")?2:e.endsWith("=")?1:0)}const B={tint:{min:0,max:100,initial:80},brightness:{min:25,max:150,initial:100}},ue=["tint","brightness"],P={min:5,max:86400,duration:60,transition:"fade"},Ae=800,Le=m.Schema.Struct({id:m.Schema.String.check(m.Schema.isPattern(/^upload:.+$/)),name:m.Schema.String.check(m.Schema.isMinLength(1)),image:ce.check(m.Schema.isMinLength(1))}),Re=m.Schema.Struct({enabled:m.Schema.Boolean,preset:m.Schema.String,image:ce,imageName:m.Schema.optional(m.Schema.String),images:m.Schema.optional(m.Schema.Array(Le)),tint:m.Schema.optional(m.Schema.Int.check(m.Schema.isBetween({minimum:B.tint.min,maximum:B.tint.max}))),brightness:m.Schema.optional(m.Schema.Int.check(m.Schema.isBetween({minimum:B.brightness.min,maximum:B.brightness.max}))),fit:m.Schema.Literals(["cover","contain"]),slideshow:m.Schema.optional(m.Schema.Boolean),duration:m.Schema.optional(m.Schema.Int.check(m.Schema.isBetween({minimum:P.min,maximum:P.max}))),transition:m.Schema.optional(m.Schema.Literals(["none","fade"])),strength:m.Schema.Int.check(m.Schema.isBetween({minimum:5,maximum:45})),hidden:m.Schema.optional(m.Schema.Array(m.Schema.String))}),ee={enabled:!1,preset:"",image:"",strength:100-B.tint.initial,fit:"cover"};function ge(e){return{tint:e.tint??100-e.strength,brightness:e.brightness??B.brightness.initial}}function K(e,t){return e?.id===t?.id&&e?.version===t?.version&&e?.image===t?.image}function X(e,t){return t.find(o=>o.id===e.preset)}function he(e){const t=e.images??[];return e.image?[{id:"custom",name:e.imageName??"",image:e.image},...t]:t}function Ie(e=[],t=ee,o=[]){const c=new Map(o.map(r=>[r.id,r]));return[...e,...he(t).map(r=>{const n=me(r.name),l=c.get(r.id);return l?.image===r.image&&l.title===n?l:{id:r.id,title:n,version:"custom",image:r.image}})]}function te(e){return e.id==="custom"||e.id.startsWith("upload:")}function Me(e,t,o){if(!te(t)||(t.id==="custom"?(e.image="",delete e.imageName):e.images=e.images?.filter(r=>r.id!==t.id),e.preset!==t.id))return;const c=o[o.findIndex(r=>r.id===t.id)+1]??o.find(r=>r.id!==t.id);e.preset=c?.id??ee.preset,c||(e.enabled=!1)}function ae(e,t){e.enabled=t!=="off",t!=="off"&&(e.preset=t)}function We(e,t,o){ae(e,t?X(e,o)?.id??o[0]?.id??"off":"off")}function V(e,t){return te(e)?e.title||t("image.custom"):e.title}function ie(e,t,o){const c=G(e.name),r=Q(e.image??"");for(const n of he(t)){if(n.name&&G(n.name)===c)throw new Error("image.duplicateName");if(r&&r===Q(n.image))throw new Error("image.duplicateImage")}for(const n of o){const l=ze(n.id);if(l&&G(l)===c)throw new Error("image.duplicateName")}}function ze(e){if(!e.startsWith("file:"))return"";const t=e.slice(5);try{return decodeURIComponent(t)}catch{return t}}function G(e){return me(e).normalize("NFC").toLowerCase()}function me(e){const t=(e.split(/[\\/]/).at(-1)??e).trim();return t.replace(/\.(?:png|jpe?g|webp|svg)$/i,"")||t}function _e(e,t,o,c,r,n){return{id:"choose",title:e.t("picker.title"),description:e.t("picker.description"),keywords:"wallpaper background image",slash:{name:"wallpaper"},async run(){e.signal.aborted||(await o(),!e.signal.aborted&&n({title:e.t("picker.title"),placeholder:e.t("picker.search"),current:c(),options:t().map(l=>({title:V(l,e.t),value:l.id}))},l=>{if(!e.signal.aborted){if(l==="settings"){e.layout.settings("wallpaper");return}r(l)}}))}}}function fe(e){return w.createMemo(()=>{const t=e();return t?{...t}:void 0},void 0,{equals:K})}function Ue(e,t,o=()=>0){const[c,r]=se.createStore({url:"",width:0,height:0,loading:!1,error:"",previous:void 0,transition:0});let n,l,p;const d=()=>{clearTimeout(p),p=void 0,l&&URL.revokeObjectURL(l.url),l=void 0,r({previous:void 0,transition:0})};w.onCleanup(()=>{d(),n&&URL.revokeObjectURL(n.url)});const b=fe(e);return w.createEffect(()=>{const C=b(),L=new AbortController;let h="";if(w.onCleanup(()=>{L.abort(),h&&URL.revokeObjectURL(h),h=""}),r({loading:!!C,error:""}),!C){d(),n&&URL.revokeObjectURL(n.url),n=void 0,r({url:"",width:0,height:0});return}(async()=>{try{const u=C.image??await t(C,L.signal);L.signal.throwIfAborted(),h=URL.createObjectURL(de(u));const g=await Y(h,L.signal);L.signal.throwIfAborted(),d();const E=w.untrack(o);n&&E>0?l=n:n&&URL.revokeObjectURL(n.url),n={url:h,width:g.naturalWidth,height:g.naturalHeight},h="",r({...n,previous:l,transition:l?E:0,loading:!1,error:""}),l&&(p=setTimeout(d,E))}catch(u){h&&URL.revokeObjectURL(h),h="",L.signal.aborted||r({loading:!1,error:u instanceof Error?u.message:String(u)})}})()}),c}function je(e,t){const[o,c]=se.createStore({url:"",width:0,height:0,loading:!1,error:""}),r=fe(e);return w.createRenderEffect(()=>{const n=r(),l=new AbortController;let p;if(w.onCleanup(()=>{l.abort(),p?.release()}),c({url:"",width:0,height:0,loading:!!n,error:""}),!!n)try{if(p=t.acquire(n),p.value){c({...p.value,loading:!1});return}p.ready.then(d=>{l.signal.aborted||c({...d,loading:!1})},d=>{l.signal.aborted||c({loading:!1,error:d instanceof Error?d.message:String(d)})})}catch(d){c({loading:!1,error:d instanceof Error?d.message:String(d)})}}),o}function Pe(e){const t=new Map;return(o,c,r)=>{const n=t.get(o)??new Set,l=r.filter(p=>!p||n.has(p)?!1:(n.add(p),!0));t.set(o,n),l.length&&e.show({variant:"error",icon:"outline-photo",title:c,description:l.join(` -`)})}}function Te(e,{maxEntries:t=48,maxBytes:r=8*1024*1024,concurrency:l=2,signal:a}={}){const o=new Map,s=new Set,d=new Map,c=new Set;let b=0,x=0,$=!1;function k(n){const h=d.get(n);h!==void 0&&(d.delete(n),b-=h)}function u(n){k(n),n.value&&URL.revokeObjectURL(n.value.url),n.value=void 0,s.delete(n)}function C(n){n.retired||(k(n),c.delete(n),o.get(n.choice.id)===n&&o.delete(n.choice.id),n.retired=!0,n.controller.abort(),n.reject(n.controller.signal.reason),n.users?s.add(n):u(n))}function L(n){if(!(n.users||n.retired))for(k(n),d.set(n,n.bytes),b+=n.bytes;d.size>t||b>r;){const h=d.keys().next().value;if(!h)break;C(h)}}function v(){for(;!$&&x(n.controller.signal.throwIfAborted(),e(n.choice,n.controller.signal))).then(h=>{n.controller.signal.throwIfAborted(),n.value={url:URL.createObjectURL(h.blob),width:h.width,height:h.height},n.bytes=h.blob.size,n.resolve(n.value),L(n)}).catch(h=>{n.reject(h),C(n)}).finally(()=>{x--,v()})}}function y(n){if($)throw new DOMException("Thumbnail cache is disposed.","AbortError");let h=o.get(n.id);if(h&&!V(h.choice,n)&&(C(h),h=void 0),!h){let T,H;const z=new Promise((f,w)=>{T=f,H=w});h={choice:{...n},controller:new AbortController,ready:z,resolve:T,reject:H,users:0,bytes:0,retired:!1},c.add(h)}const A=h;k(A),A.users++,o.set(n.id,A),v();let j=!1;return{value:A.value,ready:A.ready,release(){j||(j=!0,A.users--,A.retired&&!A.users?u(A):L(A))}}}function E(){if(!$){$=!0,a?.removeEventListener("abort",E);for(const n of new Set([...o.values(),...s]))C(n),u(n);o.clear(),s.clear(),d.clear(),b=0,c.clear()}}return a?.addEventListener("abort",E,{once:!0}),a?.aborted&&E(),{acquire:y,peek(n){const h=o.get(n.id);return h&&V(h.choice,n)?h.value:void 0},retain(n){const h=new Map(n.map(A=>[A.id,A]));for(const A of o.values())V(A.choice,h.get(A.choice.id))||C(A)},dispose:E}}const P='[data-slot="home-panel"], [data-slot="session-chat-panel"] > .bg-v2-background-bg-base, [data-component="new-session"]',be=` +`)})}}function Te(e,{maxEntries:t=48,maxBytes:o=8*1024*1024,concurrency:c=2,signal:r}={}){const n=new Map,l=new Set,p=new Map,d=new Set;let b=0,C=0,L=!1;function h(i){const s=p.get(i);s!==void 0&&(p.delete(i),b-=s)}function u(i){h(i),i.value&&URL.revokeObjectURL(i.value.url),i.value=void 0,l.delete(i)}function g(i){i.retired||(h(i),d.delete(i),n.get(i.choice.id)===i&&n.delete(i.choice.id),i.retired=!0,i.controller.abort(),i.reject(i.controller.signal.reason),i.users?l.add(i):u(i))}function E(i){if(!(i.users||i.retired))for(h(i),p.set(i,i.bytes),b+=i.bytes;p.size>t||b>o;){const s=p.keys().next().value;if(!s)break;g(s)}}function S(){for(;!L&&C(i.controller.signal.throwIfAborted(),e(i.choice,i.controller.signal))).then(s=>{i.controller.signal.throwIfAborted(),i.value={url:URL.createObjectURL(s.blob),width:s.width,height:s.height},i.bytes=s.blob.size,i.resolve(i.value),E(i)}).catch(s=>{i.reject(s),g(i)}).finally(()=>{C--,S()})}}function f(i){if(L)throw new DOMException("Thumbnail cache is disposed.","AbortError");let s=n.get(i.id);if(s&&!K(s.choice,i)&&(g(s),s=void 0),!s){let _,z;const k=new Promise((x,v)=>{_=x,z=v});s={choice:{...i},controller:new AbortController,ready:k,resolve:_,reject:z,users:0,bytes:0,retired:!1},d.add(s)}const y=s;h(y),y.users++,n.set(i.id,y),S();let W=!1;return{value:y.value,ready:y.ready,release(){W||(W=!0,y.users--,y.retired&&!y.users?u(y):E(y))}}}function $(){if(!L){L=!0,r?.removeEventListener("abort",$);for(const i of new Set([...n.values(),...l]))g(i),u(i);n.clear(),l.clear(),p.clear(),b=0,d.clear()}}return r?.addEventListener("abort",$,{once:!0}),r?.aborted&&$(),{acquire:f,peek(i){const s=n.get(i.id);return s&&K(s.choice,i)?s.value:void 0},retain(i){const s=new Map(i.map(y=>[y.id,y]));for(const y of n.values())K(y.choice,s.get(y.choice.id))||g(y)},dispose:$}}const T='[data-slot="home-panel"], [data-slot="session-chat-panel"] > .bg-v2-background-bg-base, [data-component="new-session"]',we=` [data-slot="home-panel"] .sticky.bg-v2-background-bg-base, [data-slot="session-chat-panel"] [data-session-title] > .bg-v2-background-bg-base, [data-slot="session-chat-panel"] [data-slot="session-location-bar"], @@ -34,15 +34,15 @@ z-index: -99; background: var(--wallpaper-tint, transparent); } - `}const Fe=` - :is(${P}) { + `}const Be=` + :is(${T}) { position: relative; isolation: isolate; --wallpaper-secondary: color-mix(in srgb, var(--v2-text-text-base) 88%, var(--v2-background-bg-base)); --wallpaper-text-shadow: 0 1px 2px var(--v2-background-bg-base), 0 0 4px var(--v2-background-bg-base); } - :is(${P}) [data-wallpaper-backed] { + :is(${T}) [data-wallpaper-backed] { isolation: isolate; background: transparent; } @@ -122,10 +122,10 @@ [data-component="new-session"] [data-slot="brick-breaker-hud"] :is(.bg-v2-border-border-base, .bg-v2-icon-icon-faint) { background-color: var(--wallpaper-secondary); } -`,Be=Fe+Oe(`${P}, :is(${P}) [data-wallpaper-backed]`);function Ne(e,t){const r=e.enabled&&!!t,{tint:l,brightness:a}=ge(e);return{"--wallpaper-image":r?`url(${JSON.stringify(t)})`:"none","--wallpaper-fit":e.fit,"--wallpaper-tint":r?`color-mix(in srgb, var(--v2-background-bg-base) ${l}%, transparent)`:"transparent","--wallpaper-filter":r?`brightness(${a}%) contrast(85%) saturate(90%)`:"none"}}function qe(e,t){if(!e.enabled||!t)return"";const r=Object.entries(Ne(e,t)).map(([l,a])=>`${l}: ${a};`).join(` - `);return`${P} { - ${r} -}`}function ve(e,t,r,l){const a=Math[l==="cover"?"max":"min"](e.width/r.width,e.height/r.height),o=r.width*a,s=r.height*a,d=(e.width-o)/2-(t.left-e.left),c=(e.height-s)/2-(t.top-e.top),b=x=>`${Math.round(x*1e3)/1e3}px`;return{"--wallpaper-background-size":`${b(o)} ${b(s)}`,"--wallpaper-background-position":`${b(d)} ${b(c)}`}}function De(e){if(!(e.image.width>0&&e.image.height>0))return()=>{};const t=new Map,r=new Set;let l=0,a=!1,o=!0,s=[];const d=(k,u)=>{u.attribute===null?k.removeAttribute("data-wallpaper-backed"):k.setAttribute("data-wallpaper-backed",u.attribute);for(const[C,L]of u.properties)L.value?k.style.setProperty(C,L.value,L.priority):k.style.removeProperty(C)},c=()=>{!a&&!l&&(l=requestAnimationFrame(x))},b=new ResizeObserver(c);function x(){if(l=0,a)return;o&&(s=[...document.querySelectorAll(be)],o=!1);const k=new Set,u=new Set,C=new Map,L=[];for(const v of s){const y=v.closest(P);if(!y)continue;const E=v.getBoundingClientRect(),n=C.get(y)??y.getBoundingClientRect();C.set(y,n),!(!E.width||!E.height||!n.width||!n.height)&&(k.add(v),u.add(y),u.add(v),L.push({element:v,geometry:ve(n,E,e.image,e.fit)}))}for(const[v,y]of t)k.has(v)||(d(v,y),t.delete(v));for(const{element:v,geometry:y}of L){t.has(v)||t.set(v,{attribute:v.getAttribute("data-wallpaper-backed"),properties:new Map(Object.keys(y).map(E=>[E,{value:v.style.getPropertyValue(E),priority:v.style.getPropertyPriority(E)}]))});for(const[E,n]of Object.entries(y))v.style.getPropertyValue(E)!==n&&v.style.setProperty(E,n);v.hasAttribute("data-wallpaper-backed")||v.setAttribute("data-wallpaper-backed","")}for(const v of r)u.has(v)||(b.unobserve(v),r.delete(v));for(const v of u)r.has(v)||(b.observe(v),r.add(v))}const $=new MutationObserver(()=>{o=!0,c()});return $.observe(document.body,{childList:!0,subtree:!0,attributes:!0,attributeFilter:["aria-expanded","data-locked","class"]}),document.addEventListener("scroll",c,{capture:!0,passive:!0}),window.addEventListener("resize",c,{passive:!0}),c(),()=>{if(!a){a=!0,cancelAnimationFrame(l),$.disconnect(),b.disconnect(),document.removeEventListener("scroll",c,!0),window.removeEventListener("resize",c);for(const[k,u]of t)d(k,u);t.clear(),r.clear(),s=[]}}}var Ge=i.template(""),He=i.template(""),Ve=i.template("");function Je(e){const[t,r]=g.createSignal(!!e.cache.peek(e.choice));let l;g.onMount(()=>{const o=new IntersectionObserver(s=>{r(s.some(d=>d.isIntersecting))},{rootMargin:"200px"});o.observe(l),g.onCleanup(()=>o.disconnect())});const a=_e(()=>t()?e.choice:void 0,e.cache);return(()=>{var o=Ge(),s=l;return typeof s=="function"?i.use(s,o):l=o,i.insert(o,i.createComponent(g.Show,{get when(){return a.url},get fallback(){return i.createComponent(g.Show,{get when(){return a.error},get children(){var d=He();return i.insert(d,()=>e.t("image.unavailable")),i.effect(c=>{var b=X(a.error,e.t),x=X(a.error,e.t);return b!==c.e&&i.setAttribute(d,"title",c.e=b),x!==c.t&&i.setAttribute(d,"aria-label",c.t=x),c},{e:void 0,t:void 0}),d}})},children:d=>(()=>{var c=Ve();return i.effect(()=>i.setAttribute(c,"src",d())),c})()})),i.effect(()=>i.setAttribute(o,"aria-busy",a.loading)),o})()}var Ke=i.template(" + }> +
+ { + batch(() => { setQuery(event.currentTarget.value); setActive(0) }) + list.scrollTop = 0 + }} + /> +
+ {(option, index) => } +
{ctx.t("palette.empty")}
+
+
+ +} diff --git a/src/settings.css b/src/settings.css index bc68b36..a11ab05 100644 --- a/src/settings.css +++ b/src/settings.css @@ -289,13 +289,17 @@ .opencode-wallpaper-duration input { width: 8ch; text-align: center; + font-variant-numeric: tabular-nums; +} + +.opencode-wallpaper-duration input, +.opencode-wallpaper-picker-search { padding: 6px 8px; border: 1px solid var(--v2-border-border-base); border-radius: 6px; background: var(--v2-background-bg-layer-01); color: var(--v2-text-text-base); font: inherit; - font-variant-numeric: tabular-nums; } .opencode-wallpaper-duration input:focus-visible { @@ -306,3 +310,66 @@ .opencode-wallpaper-duration input:disabled { opacity: 0.5; } + +.opencode-wallpaper-picker { + display: flex; + flex-direction: column; + gap: 8px; + height: 100%; + min-height: 0; +} + +[data-component="dialog-v2"]:has(.opencode-wallpaper-picker) [data-slot="dialog-container"] { + height: min(480px, calc(100dvh - 32px)); + max-width: calc(100vw - 32px); +} + +.opencode-wallpaper-picker-search { + flex-shrink: 0; + width: 100%; + min-height: 32px; +} + +.opencode-wallpaper-picker-list { + flex: 1; + min-height: 0; + overflow-y: auto; + overscroll-behavior: contain; +} + +.opencode-wallpaper-picker-choice { + display: block; + width: 100%; + padding: 8px; + border: 0; + border-radius: 6px; + background: transparent; + color: var(--v2-text-text-base); + font: inherit; + text-align: start; + cursor: pointer; +} + +.opencode-wallpaper-picker-choice[aria-selected="true"] { + background: var(--v2-background-bg-layer-02); +} + +.opencode-wallpaper-picker-search:focus-visible, +.opencode-wallpaper-picker-choice:focus-visible { + outline: 2px solid var(--v2-border-border-focus); + outline-offset: -2px; +} + +.opencode-wallpaper-picker-empty { + padding: 8px; + color: var(--v2-text-text-muted); +} + +.opencode-wallpaper-picker-footer { + display: flex; + align-items: center; + justify-content: space-between; + gap: 8px; + flex-wrap: wrap; + width: 100%; +} diff --git a/src/settings.tsx b/src/settings.tsx index cb9d585..50023b3 100644 --- a/src/settings.tsx +++ b/src/settings.tsx @@ -1,7 +1,7 @@ import { createMemo, createRenderEffect, createSignal, createUniqueId, For, on, onCleanup, onMount, Show, type Accessor } from "solid-js" import { usePlugin } from "@opencode/plugin/gui" import type definition from "./gui" -import { canRemoveWallpaper, changeWallpaper, checkWallpaperDuplicate, removeWallpaper, selectedWallpaper, wallpaperTitle, type WallpaperChoice } from "./model" +import { canRemoveWallpaper, changeWallpaper, checkWallpaperDuplicate, removeWallpaper, wallpaperTitle, type WallpaperChoice } from "./model" import { uploadImage } from "./image" import { appearanceControls, appearanceKeys, slideshowControls, wallpaperAppearance, type WallpaperTransition } from "./preferences" import type { ThumbnailCache } from "./thumbnail-cache" @@ -11,6 +11,7 @@ export function WallpaperSettings(props: { images: Accessor selected: Accessor select: (choice: string) => void + setEnabled: (enabled: boolean) => void thumbnails: ThumbnailCache folder: Accessor changeFolder: (folder: string, signal: AbortSignal) => Promise @@ -26,7 +27,6 @@ export function WallpaperSettings(props: { let gallery!: HTMLDivElement let slideshowDescription!: HTMLSpanElement let fileInput!: HTMLInputElement - const selected = createMemo(() => selectedWallpaper(settings.value, props.images())) const appearance = createMemo(() => wallpaperAppearance(settings.value)) const limit = () => columns() * 2 - 1 const visibleImages = createMemo(() => expanded() ? props.images() : props.images().slice(0, limit())) @@ -114,7 +114,7 @@ export function WallpaperSettings(props: { hideLabel checked={settings.value.enabled} disabled={!settings.value.enabled && !props.images().length} - onChange={(value) => select(value ? selected()?.id ?? props.images()[0]?.id ?? "off" : "off")} + onChange={(value) => { cancelUpload(); props.setEnabled(value) }} />