From 0964fdc5b72a1ec24709d87172aaccb985e41c78 Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Sat, 7 Nov 2026 22:51:56 +0900 Subject: [PATCH] feat: adapt home appearance to wallpaper colors --- .gitea/workflows/images.yml | 4 +- docs/design/navigation-home-sidebar.md | 36 +++++ internal/server/config_handler.go | 19 +++ internal/server/home_palette.go | 56 ++++++++ internal/server/home_palette_test.go | 165 ++++++++++++++++++++++ internal/server/home_wallpaper.go | 7 +- internal/server/home_wallpaper_test.go | 2 +- internal/server/i18n.go | 18 +++ internal/server/request_context.go | 3 + internal/server/testdata/home-palette.js | 59 ++++++++ static/css/config.css | 7 + static/css/home.css | 9 +- static/js/home-appearance.js | 22 ++- static/js/home-palette-core.js | 58 ++++++++ static/js/home-palette-core.test.cjs | 48 +++++++ static/js/home-palette.js | 78 ++++++++++ templates/pages/auth.gohtml | 2 +- templates/pages/config.gohtml | 3 +- templates/pages/home.gohtml | 4 +- templates/pages/page.gohtml | 4 +- templates/pages/periodical.gohtml | 6 +- templates/pages/search_home.gohtml | 17 +-- templates/partials/home_appearance.gohtml | 33 +++++ 23 files changed, 628 insertions(+), 32 deletions(-) create mode 100644 internal/server/home_palette.go create mode 100644 internal/server/home_palette_test.go create mode 100644 internal/server/testdata/home-palette.js create mode 100644 static/js/home-palette-core.js create mode 100644 static/js/home-palette-core.test.cjs create mode 100644 static/js/home-palette.js create mode 100644 templates/partials/home_appearance.gohtml diff --git a/.gitea/workflows/images.yml b/.gitea/workflows/images.yml index 29d0520..a07287f 100644 --- a/.gitea/workflows/images.yml +++ b/.gitea/workflows/images.yml @@ -35,8 +35,8 @@ jobs: [worker.oci] max-parallelism = 2 - - name: Test release tooling - run: node --test tools/ci/release-images.test.mjs + - name: Test release tooling and wallpaper palette + run: node --test tools/ci/release-images.test.mjs static/js/home-palette-core.test.cjs - name: Test uses: https://github.com/docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 diff --git a/docs/design/navigation-home-sidebar.md b/docs/design/navigation-home-sidebar.md index c861e9f..63a4d45 100644 --- a/docs/design/navigation-home-sidebar.md +++ b/docs/design/navigation-home-sidebar.md @@ -43,6 +43,42 @@ Principalで直下の子だけを認可し、最大250件、`private, no-store` modeをdata属性で指定する。これにより今後のストレージ、アダプタ、City設定でも 任意HTMLや専用ファイルブラウザを増やさず同じPickerを再利用できる。 +## 実装済みの壁紙連動配色 + +壁紙の色調からアクセントとグラス面の配色を生成し、トップ画面 `/` とその上で開く +ダイアログにだけ適用する。通常のViewer、Editor、設定画面、ログイン画面の配色は +変更しない。iframe内に独立して表示されるビューにも配色は継承しない。 + +設定は `/-/sys/config?panel=home` またはトップ画面右下の歯車から行う。既存のトップ +画面設定と同じ管理権限を必要とし、ドメイン共通で保存する。歯車のダイアログでは +その場でプレビューし、キャンセル・ESCで保存前の状態に戻す。 + +| 項目 | 値と既定値 | +| --- | --- | +| 壁紙との色連動 | `off`、`accent`、`surface`。既定は `surface`(背景も連動) | +| 色の反映量 | 0–100。既定は35。0では元のテーマを維持 | +| 明暗 | `preserve`(既定、現在のテーマを維持)、`auto`(表示時の壁紙の明るさから判定) | + +`home_wallpaper_palette` に `{"mode":"surface","strength":35,"brightness":"preserve"}` +の形式で保存する。明暗の自動判定は背景も連動する場合だけ有効。グラスの透明度は +既存の `home_glass_transparency` で独立して調整する。警告・エラー等の意味を持つ色は +上書きしない。壁紙がない場合、画像が壊れている場合、Canvasから色を読めない場合、 +強制カラーモードの場合は元のテーマを維持する。 + +表示済みの画像を64×64へ縮小し、初回描画後のアイドル時間に平均色と彩度を重み付け +したアクセント候補を抽出する。追加の画像取得、サーバでの画像解析、定期ジョブは不要。 +画像表示URLは選択したリビジョンに固定し、抽出結果をDomain UUIDと画像SHA256の組で +sessionStorageに最大24件保存する。キャッシュにはRGB値と透明部分の割合だけを保存し、 +画像本体は保存しない。ストレージが使えない場合は表示中の画像から抽出する。 + +文字・リンクは推定したグラス背景とのコントラストを補正する。ただし画像の局所的な +明暗までは保証しないため、細かい柄で読みにくい場合は透明度を下げるか色連動をオフにする。 +既存テーマを切り替えた際は新しいテーマを基準に再計算し、オフにするとそのテーマに戻る。 + +回帰テストは `node --test static/js/home-palette-core.test.cjs` と `TestHomePalette*`。 +`PAGESWIKI_BROWSER_TEST=1` でブラウザテストを有効化すると、一時DBと合成画像を使い、 +保存・キャンセル・再読み込み時のキャッシュ利用・テーマ切替・画面幅を通して検証する。 + ## サイドバー詳細設計(実装待ち) 管理画面のグループ化されたサイドバーは diff --git a/internal/server/config_handler.go b/internal/server/config_handler.go index 98cec9e..65ce95c 100644 --- a/internal/server/config_handler.go +++ b/internal/server/config_handler.go @@ -290,6 +290,11 @@ func (s *Server) handleConfig( } case "home": + palette, paletteErr := s.parseHomePalette(domainUUID, r.Form) + if paletteErr != nil { + http.Error(w, paletteErr.Error(), http.StatusBadRequest) + return + } if controlled, e := s.store.DomainEntryControlled(domainUUID); e != nil || controlled { http.Error(w, translate(s.getLocale(domainUUID), "periodical.controlled"), http.StatusConflict) return @@ -344,6 +349,10 @@ func (s *Server) handleConfig( http.Error(w, err.Error(), http.StatusInternalServerError) return } + if err = s.saveHomePalette(domainUUID, palette); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } if err = s.store.SetConfigInDomain(domainUUID, "home_wallpaper_opacity", strconv.Itoa(wallpaperOpacity)); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return @@ -463,6 +472,11 @@ func (s *Server) handleConfig( } case "home-appearance": + palette, paletteErr := s.parseHomePalette(domainUUID, r.Form) + if paletteErr != nil { + http.Error(w, paletteErr.Error(), http.StatusBadRequest) + return + } if controlled, e := s.store.DomainEntryControlled(domainUUID); e != nil || controlled { http.Error(w, translate(s.getLocale(domainUUID), "periodical.controlled"), http.StatusConflict) return @@ -472,6 +486,10 @@ func (s *Server) handleConfig( http.Error(w, parseErr.Error(), http.StatusBadRequest) return } + if err = s.saveHomePalette(domainUUID, palette); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } if err = s.store.SetConfigInDomain(domainUUID, "home_glass_transparency", strconv.Itoa(glassTransparency)); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return @@ -1064,6 +1082,7 @@ func (s *Server) handleConfig( "HomeWallpaperPath": homeWallpaperPath, "HomeWallpaperOpacity": homeWallpaperOpacity, "HomeGlassTransparency": s.homeGlassTransparency(domainUUID), + "HomePalette": s.homePalette(domainUUID), "HomeLayout": s.homeLayout(s.domainUUIDForRequest(r)), "HomeBookmarks": s.homeBookmarksText(s.domainUUIDForRequest(r)), "VirtualFolderPages": s.getVirtualFolderPages(s.domainUUIDForRequest(r)), diff --git a/internal/server/home_palette.go b/internal/server/home_palette.go new file mode 100644 index 0000000..8c8a6c1 --- /dev/null +++ b/internal/server/home_palette.go @@ -0,0 +1,56 @@ +package server + +import ( + "encoding/json" + "errors" + "net/url" + "strconv" +) + +type homePaletteSettings struct { + Mode string `json:"mode"` + Strength int `json:"strength"` + Brightness string `json:"brightness"` +} + +func validHomePalette(p homePaletteSettings) bool { + return (p.Mode == "off" || p.Mode == "accent" || p.Mode == "surface") && p.Strength >= 0 && p.Strength <= 100 && (p.Brightness == "preserve" || p.Brightness == "auto") +} + +func (s *Server) homePalette(domain string) homePaletteSettings { + p := homePaletteSettings{Mode: "surface", Strength: 35, Brightness: "preserve"} + var saved homePaletteSettings + if json.Unmarshal([]byte(s.getDomainConfig("home_wallpaper_palette", domain)), &saved) == nil && validHomePalette(saved) { + return saved + } + return p +} + +func (s *Server) parseHomePalette(domain string, form url.Values) (homePaletteSettings, error) { + p := s.homePalette(domain) + if form.Has("home_palette_mode") { + p.Mode = form.Get("home_palette_mode") + } + if form.Has("home_palette_brightness") { + p.Brightness = form.Get("home_palette_brightness") + } + if form.Has("home_palette_strength") { + n, err := strconv.Atoi(form.Get("home_palette_strength")) + if err != nil { + return p, errors.New("invalid wallpaper palette strength") + } + p.Strength = n + } + if !validHomePalette(p) { + return p, errors.New("invalid wallpaper palette settings") + } + return p, nil +} + +func (s *Server) saveHomePalette(domain string, p homePaletteSettings) error { + b, err := json.Marshal(p) + if err != nil { + return err + } + return s.store.SetConfigInDomain(domain, "home_wallpaper_palette", string(b)) +} diff --git a/internal/server/home_palette_test.go b/internal/server/home_palette_test.go new file mode 100644 index 0000000..44961b8 --- /dev/null +++ b/internal/server/home_palette_test.go @@ -0,0 +1,165 @@ +package server + +import ( + "bytes" + "context" + "image" + "image/color" + "image/png" + "net/http" + "net/http/httptest" + "net/url" + "os" + "os/exec" + "strings" + "testing" + "time" +) + +func TestHomePaletteSettingsAndScope(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/", s.handleHome) + saveWallpaperFixture(t, s, domain, "/wallpapers/a.jpg", "image/jpeg") + if err := s.store.SetConfigInDomain(domain, "home_wallpaper_path", "/wallpapers/a.jpg"); err != nil { + t.Fatal(err) + } + initial := s.homePalette(domain) + if initial.Mode != "surface" || initial.Strength != 35 || initial.Brightness != "preserve" { + t.Fatal(initial) + } + for _, values := range []url.Values{{"home_palette_mode": {"bad"}}, {"home_palette_strength": {"101"}}, {"home_palette_strength": {"-1"}}, {"home_palette_strength": {"bad"}}, {"home_palette_brightness": {"bad"}}} { + values.Set("section", "home-appearance") + values.Set("home_glass_transparency", "47") + if w := configRequest(s, token, "POST", "/-/sys/config", values); w.Code != 400 { + t.Fatal(w.Code, w.Body) + } + if s.homePalette(domain) != initial || s.homeGlassTransparency(domain) != 42 { + t.Fatal("invalid request partially saved") + } + } + values := url.Values{"section": {"home-appearance"}, "home_glass_transparency": {"47"}, "home_palette_mode": {"accent"}, "home_palette_strength": {"70"}, "home_palette_brightness": {"auto"}} + if w := configRequest(s, token, "POST", "/-/sys/config", values); w.Code != http.StatusFound { + t.Fatal(w.Code, w.Body) + } + if p := s.homePalette(domain); p.Mode != "accent" || p.Strength != 70 || p.Brightness != "auto" { + t.Fatal(p) + } + member, err := s.store.CreatePasswordAccount(domain, "palette-reader", "a long test password", "Reader", "") + if err != nil { + t.Fatal(err) + } + memberToken, err := s.store.CreateAuthSession(domain, member.UUID) + if err != nil { + t.Fatal(err) + } + if w := configRequest(s, memberToken, "POST", "/-/sys/config", url.Values{"section": {"home-appearance"}, "home_palette_mode": {"off"}, "home_glass_transparency": {"47"}}); w.Code != http.StatusForbidden { + t.Fatalf("member changed domain appearance: %d", w.Code) + } + if s.homePalette(domain).Mode != "accent" { + t.Fatal("member overwrote settings") + } + for _, layout := range []string{"classic", "search", "directory"} { + if err := s.store.SetConfigInDomain(domain, "home_layout", layout); err != nil { + t.Fatal(err) + } + w := configRequest(s, token, "GET", "/", nil) + for _, want := range []string{`data-home-palette`, `data-mode="accent"`, `data-strength="70"`, `data-home-appearance-open`, `/static/js/home-palette.js?v=1`} { + if w.Code != 200 || !strings.Contains(w.Body.String(), want) { + t.Fatal(layout, w.Code, want) + } + } + } + for _, path := range []string{"/-/sys/config?panel=home", "/missing-page"} { + w := configRequest(s, token, http.MethodGet, path, nil) + if strings.Contains(w.Body.String(), `data-home-palette `) || strings.Contains(w.Body.String(), `src="/static/js/home-palette.js`) { + t.Fatal("theme leaked outside home", path) + } + } + settings := configRequest(s, token, http.MethodGet, "/-/sys/config?panel=home", nil) + if settings.Code != http.StatusOK || !strings.Contains(settings.Body.String(), `name="home_palette_mode"`) || !strings.Contains(settings.Body.String(), `value="accent" selected`) { + t.Fatal("settings panel did not load saved palette") + } + for _, section := range []string{"home", "home-appearance"} { + invalid := url.Values{"section": {section}, "home_palette_strength": {"NaN"}, "home_layout": {"search"}} + if w := configRequest(s, token, http.MethodPost, "/-/sys/config", invalid); w.Code != http.StatusBadRequest { + t.Fatal(section, w.Code) + } + } + // Old forms may omit the new fields without resetting their saved settings. + delete(values, "home_palette_mode") + delete(values, "home_palette_strength") + delete(values, "home_palette_brightness") + if w := configRequest(s, token, "POST", "/-/sys/config", values); w.Code != http.StatusFound { + t.Fatal(w.Code) + } + if s.homePalette(domain).Mode != "accent" { + t.Fatal("old form reset settings") + } + if err := s.store.SetConfigInDomain(domain, "home_wallpaper_path", ""); err != nil { + t.Fatal(err) + } + w := configRequest(s, token, "GET", "/", nil) + if strings.Contains(w.Body.String(), `src="/static/js/home-palette.js`) { + t.Fatal("loaded extractor without wallpaper") + } +} + +func TestHomePaletteChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain := configFixture(t) + s.store.BackgroundJobsDisabled = true + s = New(s.store) + picture := image.NewRGBA(image.Rect(0, 0, 480, 320)) + for y := 0; y < 320; y++ { + for x := 0; x < 480; x++ { + picture.SetRGBA(x, y, color.RGBA{uint8(30 + x/4), uint8(60 + y/3), uint8(180 + y/5), 255}) + } + } + var content bytes.Buffer + if err := png.Encode(&content, picture); err != nil { + t.Fatal(err) + } + object, err := s.store.CreatePageAtPathInDomain(domain, "/wallpapers/test.png") + if err != nil { + t.Fatal(err) + } + if _, err = s.store.SaveRevisionContent(object, content.Bytes(), "test", "und", "image/png", "test.png"); err != nil { + t.Fatal(err) + } + for k, v := range map[string]string{"home_layout": "directory", "home_wallpaper_path": "/wallpapers/test.png", "home_wallpaper_opacity": "70", "theme": "nanoha-dark"} { + if err := s.store.SetConfigInDomain(domain, k, v); err != nil { + t.Fatal(err) + } + } + script, err := os.ReadFile("internal/server/testdata/home-palette.js") + if err != nil { + t.Fatal(err) + } + handler := s.handler() + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.URL.Path == "/fixture" { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + _, _ = w.Write([]byte("")) + return + } + handler.ServeHTTP(w, r) + })) + defer server.Close() + ctx, cancel := context.WithTimeout(context.Background(), 55*time.Second) + defer cancel() + width := os.Getenv("HOME_PALETTE_WIDTH") + if width == "" { + width = "1440" + } + args := []string{"internal/server/testdata/vim-browser-smoke.mjs", server.URL + "/fixture", t.TempDir(), os.Getenv("HOME_PALETTE_SCREENSHOT"), width, "850"} + if out, err := exec.CommandContext(ctx, "node", args...).CombinedOutput(); err != nil { + t.Fatalf("palette: %v\n%s", err, out) + } + if p := s.homePalette(domain); p.Mode != "accent" || p.Strength != 70 || p.Brightness != "auto" { + t.Fatalf("browser save not persisted: %+v", p) + } +} diff --git a/internal/server/home_wallpaper.go b/internal/server/home_wallpaper.go index 86c9c65..adccf7e 100644 --- a/internal/server/home_wallpaper.go +++ b/internal/server/home_wallpaper.go @@ -20,6 +20,7 @@ type homeWallpaperView struct { Path string URL string Opacity string + Key string } // configuredLoginWallpaper returns only the image selected by the Domain @@ -143,7 +144,8 @@ func (s *Server) homeWallpaperForRequest(r *http.Request) homeWallpaperView { httpRequest := r if objectUUID, err := s.store.ResolvePathInDomain(domainUUID, configured); err == nil && s.requestCanReadPath(httpRequest, configured) { if revision, err := s.latestRevisionMetadataForRequest(httpRequest, objectUUID); err == nil && imageContentType(revision.ContentType) { - view.URL = rawProjectionURL("path:" + configured) + view.URL = rawProjectionURL("rev:" + revision.UUID) + view.Key = revision.DocumentHash return view } } @@ -165,6 +167,7 @@ func (s *Server) homeWallpaperForRequest(r *http.Request) homeWallpaperView { if value, err := rand.Int(rand.Reader, big.NewInt(int64(len(candidates)))); err == nil { index = int(value.Int64()) } - view.URL = rawProjectionURL("path:" + candidates[index].Path) + view.URL = rawProjectionURL("rev:" + candidates[index].RevisionUUID) + view.Key = candidates[index].DocumentHash return view } diff --git a/internal/server/home_wallpaper_test.go b/internal/server/home_wallpaper_test.go index 47930c2..494dc1e 100644 --- a/internal/server/home_wallpaper_test.go +++ b/internal/server/home_wallpaper_test.go @@ -107,7 +107,7 @@ func TestHomeWallpaperFolderPickerAndTheme(t *testing.T) { r := httptest.NewRequest(http.MethodGet, "http://localhost/", nil) r.Header.Set("Authorization", "Bearer "+token) view := s.homeWallpaperForRequest(r) - if view.Opacity != "0.41" || (view.URL != "/v/raw/path:/wallpapers/a.jpg" && view.URL != "/v/raw/path:/wallpapers/b.png") { + if view.Opacity != "0.41" || !strings.HasPrefix(view.URL, "/v/raw/rev:") || len(view.Key) != 64 { t.Fatalf("view=%#v", view) } homeResponse := httptest.NewRecorder() diff --git a/internal/server/i18n.go b/internal/server/i18n.go index 33dbf32..03a762c 100644 --- a/internal/server/i18n.go +++ b/internal/server/i18n.go @@ -231,6 +231,15 @@ var translations = map[string]map[string]string{ "home.wallpaper_opacity": "Wallpaper opacity (%)", "home.wallpaper_help": "Choose one image, or a folder whose direct image children are selected on each reload. Access permissions still apply.", "home.appearance": "Home appearance", + "home.palette_mode": "Wallpaper color matching", + "home.palette_off": "Off — use the selected theme", + "home.palette_accent": "Accent only", + "home.palette_surface": "Accent and surfaces", + "home.palette_strength": "Color influence", + "home.palette_brightness": "Light and dark", + "home.palette_preserve": "Keep the current theme brightness", + "home.palette_auto": "Choose from the displayed wallpaper", + "home.palette_help": "Applies only to the home page and its dialogs. Warning colors are preserved. If extraction fails, the selected theme remains. Shared by this domain.", "home.glass_transparency": "Glass transparency (%)", "home.glass_help": "Controls the shared transparency of the home search, menus, suggestions, cards, and dialogs. Higher values are more transparent.", "picker.open": "Browse PagesWiki", @@ -1002,6 +1011,15 @@ var translations = map[string]map[string]string{ "home.wallpaper_opacity": "壁紙の透明度(%)", "home.wallpaper_help": "画像を1つ選ぶか、直下の画像をリロードごとに選択するフォルダを指定します。閲覧権限はそのまま適用されます。", "home.appearance": "トップ画面の外観", + "home.palette_mode": "壁紙との色連動", + "home.palette_off": "オフ — 選択中のテーマを使用", + "home.palette_accent": "アクセントのみ", + "home.palette_surface": "背景も連動", + "home.palette_strength": "色の反映量", + "home.palette_brightness": "明暗", + "home.palette_preserve": "現在のテーマの明暗を維持", + "home.palette_auto": "表示中の壁紙から自動判定", + "home.palette_help": "トップ画面とその上のダイアログにのみ適用します。警告色は変更しません。色を抽出できない場合は選択中のテーマを維持します。このドメインで共通の設定です。", "home.glass_transparency": "グラスの透明度(%)", "home.glass_help": "トップ画面の検索、メニュー、サジェスト、カード、ダイアログに共通の透明度です。数値を上げるほど背景が透けます。", "picker.open": "PagesWikiから選択", diff --git a/internal/server/request_context.go b/internal/server/request_context.go index c66e98d..206b4eb 100644 --- a/internal/server/request_context.go +++ b/internal/server/request_context.go @@ -84,6 +84,9 @@ func (s *Server) renderWithContext( wallpaper := s.homeWallpaperForRequest(r) data["HomeWallpaperURL"] = wallpaper.URL data["HomeWallpaperOpacity"] = wallpaper.Opacity + data["HomeWallpaperKey"] = wallpaper.Key + data["HomePalette"] = s.homePalette(domainUUID) + data["HomePaletteDomain"] = domainUUID if wallpaper.URL != "" { w.Header().Set("Cache-Control", "private, no-cache") } diff --git a/internal/server/testdata/home-palette.js b/internal/server/testdata/home-palette.js new file mode 100644 index 0000000..f9dcc66 --- /dev/null +++ b/internal/server/testdata/home-palette.js @@ -0,0 +1,59 @@ +(async () => { + const assert = (ok, message) => { if (!ok) throw Error(message); }; + const delay = ms => new Promise(r => setTimeout(r, ms)); + const wait = async check => { for (let n=0;n<200;n++) { if(check()) return; await delay(25); } throw Error('Timed out: '+check); }; + const frame=document.createElement('iframe');frame.style='display:block;width:100%;height:100vh;border:0';document.body.append(frame); + try { + const load=()=>new Promise(resolve=>{frame.onload=resolve;frame.src='/';}); + await load(); + let w=frame.contentWindow,d=frame.contentDocument; + await wait(()=>d.body.dataset.homePaletteActive==='surface'); + assert(d.querySelector('[data-home-palette]').dataset.paletteSource==='image','First palette not extracted'); + assert(w.performance.getEntriesByType('resource').filter(e=>e.name.includes('/v/raw/')).length===1,'Wallpaper fetched more than once'); + const before=d.body.style.getPropertyValue('--bg'); + const form=d.querySelector('[data-home-appearance-form]'),dialog=d.querySelector('[data-home-appearance-dialog]'); + const change=(name,value)=>{form.elements[name].value=value;form.elements[name].dispatchEvent(new w.Event('input',{bubbles:true}));}; + d.querySelector('[data-home-appearance-open]').click(); + change('home_palette_mode','off'); + assert(!d.body.dataset.homePaletteActive && !d.body.style.getPropertyValue('--bg'),'Off did not restore theme'); + d.querySelector('[data-home-appearance-cancel]').click(); + assert(d.body.style.getPropertyValue('--bg')===before,'Cancel did not restore palette'); + assert(!dialog.open,'Cancel did not close dialog'); + d.querySelector('[data-home-appearance-open]').click(); + change('home_palette_mode','accent');change('home_palette_strength','70');change('home_palette_brightness','auto'); + change('home_glass_transparency','47'); + assert(!d.body.style.getPropertyValue('--bg') && d.body.style.getPropertyValue('--accent'),'Accent mode tinted surface'); + form.requestSubmit();await wait(()=>!dialog.open); + await load();w=frame.contentWindow;d=frame.contentDocument; + await wait(()=>d.body.dataset.homePaletteActive==='accent'); + assert(d.querySelector('[data-home-palette]').dataset.paletteSource==='cache','Reload did not reuse palette'); + assert(d.querySelector('[name=home_palette_strength]').value==='70','Saved value not loaded'); + assert(d.body.style.getPropertyValue('--home-glass-opacity')==='53%','Glass setting lost'); + // A broken image must immediately remove derived colors, not retain a stale palette. + d.querySelector('.home-wallpaper').dispatchEvent(new w.Event('error')); + assert(!d.body.dataset.homePaletteActive && !d.body.style.getPropertyValue('--accent'),'Image error retained derived colors'); + w.sessionStorage.setItem('pageswiki.wallpaper-palette.v1','invalid cache'); + await load();w=frame.contentWindow;d=frame.contentDocument; + await wait(()=>d.body.dataset.homePaletteActive==='accent'); + assert(d.querySelector('[data-home-palette]').dataset.paletteSource==='image','Invalid cache did not fall back to extraction'); + assert(Array.isArray(JSON.parse(w.sessionStorage.getItem('pageswiki.wallpaper-palette.v1'))),'Invalid cache was not repaired'); + const theme=d.querySelector('[data-theme-select]'); + theme.value='light';theme.dispatchEvent(new w.Event('change',{bubbles:true})); + await wait(()=>!theme.disabled);await delay(100); + assert(d.body.dataset.homePaletteActive==='accent','Theme switch disabled palette'); + d.querySelector('[data-home-appearance-open]').click(); + const form2=d.querySelector('[data-home-appearance-form]'); + form2.elements.home_palette_mode.value='off';form2.elements.home_palette_mode.dispatchEvent(new w.Event('input',{bubbles:true})); + assert(w.getComputedStyle(d.body).backgroundColor==='rgb(247, 247, 247)','Off did not restore newly selected theme'); + d.querySelector('[data-home-appearance-cancel]').click(); + theme.value='nanoha-dark';theme.dispatchEvent(new w.Event('change',{bubbles:true}));await wait(()=>!theme.disabled);await delay(100); + d.querySelector('[data-home-appearance-open]').click(); + form2.elements.home_palette_mode.value='surface';form2.elements.home_palette_mode.dispatchEvent(new w.Event('input',{bubbles:true})); + const overflow=[...d.body.querySelectorAll('*')].filter(el=>{const r=el.getBoundingClientRect();return r.width>0 && r.right>w.innerWidth+1;}).slice(0,12).map(el=>el.tagName+'.'+el.className+':'+Math.round(el.getBoundingClientRect().right)); + assert(d.documentElement.scrollWidth<=w.innerWidth,'Viewport overflows horizontally: '+d.documentElement.scrollWidth+'/'+w.innerWidth+' '+overflow.join(', ')); + const rect=d.querySelector('[data-home-appearance-dialog]').getBoundingClientRect(); + assert(rect.x>=0 && rect.right<=w.innerWidth && rect.top>=0 && rect.bottom<=w.innerHeight,'Dialog exceeds viewport'); + // Deliberately leave an unsaved surface preview visible for screenshot review. + document.body.dataset.vimReady='1'; + } catch(error) { const out=document.createElement('pre');out.id='error';out.textContent=error.stack;document.body.append(out); } +})(); diff --git a/static/css/config.css b/static/css/config.css index 6c58392..3528e84 100644 --- a/static/css/config.css +++ b/static/css/config.css @@ -107,6 +107,13 @@ body.mode-config .config-section { .asset-detail-dialog { width:min(72rem,calc(100vw - 2rem));max-height:calc(100vh - 2rem);overflow:auto;background:var(--bg);color:var(--fg);border:1px solid var(--border-soft);border-radius:.5rem;padding:1.25rem } .asset-detail-dialog::backdrop { background:rgba(0,0,0,.55) } .config-path-control,.config-range-control{display:flex;align-items:center;gap:.5rem;min-width:0}.config-path-control input{flex:1;min-width:0}.config-path-control button{flex:0 0 2.2rem;height:2.2rem;padding:0}.config-range-control input{flex:1;min-width:8rem}.config-range-control output{min-width:3.5rem;text-align:end;font-variant-numeric:tabular-nums} +.mode-config .home-palette-controls{display:grid;grid-template-columns:repeat(auto-fit,minmax(min(100%,15rem),1fr));gap:.75rem;min-width:0} +.mode-config .home-palette-controls label{display:grid;gap:.35rem;min-width:0} +.mode-config .home-palette-controls select{width:100%;min-width:0} +.mode-config .home-palette-controls p{grid-column:1/-1;margin:0} +.mode-config .home-appearance-range{display:flex;gap:.5rem;align-items:center;min-width:0} +.mode-config .home-appearance-range input{flex:1;min-width:0;accent-color:var(--accent)} +.mode-config .home-appearance-range output{min-width:3.5rem;text-align:end;font-variant-numeric:tabular-nums} .config-path-picker{box-sizing:border-box;width:min(46rem,95vw);height:min(42rem,90dvh);margin:auto;padding:0;overflow:hidden;border:1px solid var(--border);border-radius:.8rem;background:var(--input-bg,var(--bg));color:var(--fg);box-shadow:0 1.5rem 5rem #0009}.config-path-picker[open]{display:grid;grid-template-rows:auto auto auto minmax(0,1fr) auto}.config-path-picker::backdrop{background:#0009;backdrop-filter:blur(3px)}.config-path-picker>header,.config-path-picker>nav,.config-path-picker>footer{display:flex;align-items:center;gap:.6rem;padding:.75rem 1rem;background:var(--input-bg,var(--bg))}.config-path-picker>header{justify-content:space-between;border-bottom:1px solid var(--border)}.config-path-picker>header h2{margin:0;font-size:1.05rem}.config-path-picker>header button{border:0;background:transparent;color:inherit;font-size:1.4rem}.config-path-picker>nav{border-bottom:1px solid var(--border-soft)}.config-path-picker>nav code{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.config-path-picker>[data-path-picker-status]{min-height:1.2rem;margin:0;padding:.45rem 1rem}.config-path-picker-list{min-height:10rem;padding:.25rem .5rem;overflow:auto;overscroll-behavior:contain}.config-path-picker-item{display:grid;grid-template-columns:1.5rem minmax(0,1fr) auto;align-items:center;gap:.55rem;width:100%;padding:.5rem .65rem;border:0;border-radius:.35rem;background:transparent;color:inherit;text-align:start}.config-path-picker-item:hover,.config-path-picker-item[aria-selected=true]{background:var(--row-hover,var(--border-soft))}.config-path-picker-item[aria-selected=true]{outline:1px solid var(--accent)}.config-path-picker-item span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.config-path-picker-item small{color:var(--muted)}.config-path-picker>footer{justify-content:flex-end;border-top:1px solid var(--border)} .asset-dialog-close { position:absolute;right:.75rem;top:.75rem } .table-scroll { overflow-x: auto; } diff --git a/static/css/home.css b/static/css/home.css index fbc9b22..2cb2cbb 100644 --- a/static/css/home.css +++ b/static/css/home.css @@ -72,6 +72,13 @@ body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog header { bac .home-appearance-dialog h2 { font-size:1.1rem; } .home-appearance-dialog header button { border:0; background:transparent; color:inherit; font-size:1.5rem; cursor:pointer; } .home-appearance-dialog label { display:grid; gap:.55rem; } +.home-palette-controls { display:grid; gap:.85rem; min-width:0; } +.home-appearance-dialog { max-height:calc(100dvh - 2rem); overflow:auto; overscroll-behavior:contain; } +.home-palette-controls label { display:grid; gap:.4rem; } +.home-palette-controls select { width:100%; min-width:0; padding:.45rem .6rem; color:var(--input-fg,var(--fg)); background:var(--input-bg,var(--bg)); border:1px solid var(--input-border,var(--border)); border-radius:.4rem; } +body[data-home-palette-active] { background-color:var(--bg); color:var(--fg); accent-color:var(--accent); } +body[data-home-palette-active] .home-search :is(input,button) { color:var(--fg); } +body[data-home-palette-active] :is(.home-wiki-title,.home-shortcuts) { text-shadow:0 1px 4px color-mix(in srgb,var(--bg) 85%,transparent); } .home-appearance-range { display:grid; grid-template-columns:minmax(0,1fr) 3.5rem; align-items:center; gap:.75rem; } .home-appearance-range input { width:100%; accent-color:var(--accent); } .home-appearance-range output { color:var(--fg); font-variant-numeric:tabular-nums; text-align:right; } @@ -92,7 +99,7 @@ body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog header { bac .home-paged .home-main[data-home-page="bookmarks"] { transform:translate3d(0,calc(-100dvh + var(--home-pager-drag)),0); } .home-paged .home-main[data-home-dragging] { transition:none; user-select:none; } .home-pager-page { position:relative; min-width:0; height:100vh; height:100dvh; } -.home-search-page { display:grid; place-items:center; padding:5rem 0; touch-action:pan-x; } +.home-search-page { display:grid; grid-template-columns:minmax(0,1fr); place-items:center; padding:5rem 0; touch-action:pan-x; } .home-search-page .home-search { align-self:center; } .home-bookmarks-page { padding:4.5rem 0 3rem; overflow:auto; overscroll-behavior:contain; scrollbar-gutter:stable; touch-action:pan-y; } .home-bookmarks-page-head { display:flex; align-items:center; justify-content:space-between; gap:1rem; margin:0 0 1.25rem; padding-inline:.25rem; } diff --git a/static/js/home-appearance.js b/static/js/home-appearance.js index 1860f76..4348020 100644 --- a/static/js/home-appearance.js +++ b/static/js/home-appearance.js @@ -8,23 +8,35 @@ if (!open || !dialog || !form || !input || !output || !status) return; let saved = Number(input.value); + const paletteNames = ['home_palette_mode','home_palette_strength','home_palette_brightness']; + let savedPalette = paletteNames.map(name => form.elements[name]?.value); + const palettePreview = () => { + const strength = Number(form.elements.home_palette_strength?.value ?? 35); + const label = form.querySelector('[data-palette-strength]'); + if (label) label.textContent = `${strength}%`; + document.dispatchEvent(new CustomEvent('pageswiki:home-appearance', {detail:{mode:form.elements.home_palette_mode?.value || 'off', strength, brightness:form.elements.home_palette_brightness?.value || 'preserve'}})); + }; const preview = value => { const transparency = Math.max(0, Math.min(85, Number(value) || 0)); document.body.style.setProperty('--home-glass-opacity', `${100 - transparency}%`); output.value = `${transparency}%`; output.textContent = `${transparency}%`; + palettePreview(); }; const restore = () => { input.value = String(saved); + paletteNames.forEach((name,i) => { if (form.elements[name]) form.elements[name].value=savedPalette[i]; }); preview(saved); status.textContent = ''; }; const close = () => { + if (form.querySelector('[type=submit]').disabled) return; restore(); dialog.close(); }; input.addEventListener('input', () => preview(input.value)); + paletteNames.forEach(name => form.elements[name]?.addEventListener('input',palettePreview)); open.addEventListener('click', () => { restore(); dialog.showModal(); @@ -46,25 +58,29 @@ event.preventDefault(); const submit = form.querySelector('[type=submit]'); if (submit.disabled) return; + const submitted = new URLSearchParams(new FormData(form)); + const controls = [...form.querySelectorAll('input,select,button')].filter(node => !node.disabled); + controls.forEach(node => { node.disabled=true; }); submit.disabled = true; status.textContent = ''; try { const response = await fetch(form.action, { method: 'POST', - body: new URLSearchParams(new FormData(form)), + body: submitted, headers: {Accept: 'application/json'}, signal: AbortSignal.timeout(15000), }); if (!response.ok) throw new Error((await response.text()).trim()); await response.json(); - saved = Number(input.value); + saved = Number(submitted.get('home_glass_transparency')); + savedPalette = paletteNames.map(name => submitted.get(name)); preview(saved); status.textContent = form.dataset.saved; window.setTimeout(() => dialog.open && dialog.close(), 350); } catch (error) { status.textContent = error.message; } finally { - submit.disabled = false; + controls.forEach(node => { node.disabled=false; }); } }); })(); diff --git a/static/js/home-palette-core.js b/static/js/home-palette-core.js new file mode 100644 index 0000000..d1eb9aa --- /dev/null +++ b/static/js/home-palette-core.js @@ -0,0 +1,58 @@ +/* Bounded, dependency-free palette math; also exercised by node --test. */ +((root) => { + 'use strict'; + const clamp = (x, a = 0, b = 1) => Math.max(a, Math.min(b, x)); + const mix = (a, b, n) => a.map((x, i) => x * (1 - n) + b[i] * n); + const luminance = c => c.map(x => { x /= 255; return x <= .04045 ? x / 12.92 : ((x + .055) / 1.055) ** 2.4; }).reduce((a, x, i) => a + x * [.2126, .7152, .0722][i], 0); + const contrast = (a, b) => (Math.max(luminance(a), luminance(b)) + .05) / (Math.min(luminance(a), luminance(b)) + .05); + const ink = bg => contrast([255,255,255], bg) >= contrast([0,0,0], bg) ? [255,255,255] : [0,0,0]; + const readable = (c, bg, ratio) => { + const end = ink(bg); + for (let n = 0; n <= 20; n++) { const v = mix(c, end, n / 20); if (contrast(v, bg) >= ratio) return v; } + return end; + }; + const css = c => '#' + c.map(v => Math.round(clamp(v,0,255)).toString(16).padStart(2,'0')).join(''); + function extract(pixels) { + if (!pixels || pixels.length > 64 * 64 * 4 || pixels.length % 4) return null; + const bins = new Map(), sum = [0,0,0]; let weight = 0; + for (let i = 0; i < pixels.length; i += 4) { + const a = pixels[i+3] / 255; if (a < .06) continue; + const c = [pixels[i], pixels[i+1], pixels[i+2]], key = c.map(x => x >> 5).join(','); + const bin = bins.get(key) || {sum:[0,0,0], weight:0}; + c.forEach((v,j) => { sum[j] += v*a; bin.sum[j] += v*a; }); + bin.weight += a; weight += a; bins.set(key, bin); + } + if (!weight) return null; + const average = sum.map(x => x / weight); let accent = average, best = 0; + for (const bin of bins.values()) { + const c = bin.sum.map(x => x / bin.weight), hi = Math.max(...c), lo = Math.min(...c); + const saturation = hi ? (hi-lo)/hi : 0, light = luminance(c); + const score = Math.sqrt(bin.weight) * saturation * (light > .025 && light < .85 ? 1 : .1); + if (score > best) { best = score; accent = c; } + } + return {average, accent, coverage:weight / (pixels.length / 4)}; + } + function colors(p, base, opts) { + if (!p || opts.mode === 'off' || !opts.strength || opts.opacity <= 0) return {}; + const strength = clamp(opts.strength / 100), opacity = clamp(opts.opacity * p.coverage); + const backdrop = mix(base.bg, p.average, opacity); + const dark = opts.brightness === 'auto' && opts.mode === 'surface' ? luminance(backdrop) < .36 : luminance(base.bg) < .36; + const neutral = dark ? [18,20,26] : [244,246,250]; + const hue = mix(p.average, p.accent, .35); + const tinted = mix(neutral, hue, dark ? .23 : .12); + const bg = opts.mode === 'surface' ? mix(opts.brightness === 'auto' ? neutral : base.bg, tinted, strength) : base.bg; + const behind = mix(bg, p.average, opacity), glass = mix(behind, bg, clamp(opts.glass)); + const accent = readable(mix(base.accent, p.accent, strength), glass, 3); + const result = {'--accent':css(accent), '--link':css(readable(accent, glass, 4.5)), '--link-hover':css(readable(accent,glass,7))}; + if (opts.mode !== 'surface') return result; + const fg = readable(dark ? [238,242,248] : [22,25,32], glass, 7); + Object.assign(result, {'--bg':css(bg), '--panel':css(bg), '--fg':css(fg), '--muted':css(readable(mix(fg,glass,.3),glass,4.5)), + '--border':css(mix(bg,accent,.32)), '--border-soft':css(mix(bg,accent,.18)), + '--input-bg':css(bg), '--input-fg':css(fg), '--input-border':css(mix(bg,accent,.4)), + '--button-bg':css(bg), '--button-fg':css(fg), '--button-border':css(mix(bg,accent,.4)), '--button-hover-bg':css(mix(bg,accent,.12))}); + return result; + } + const api = {extract, colors, luminance, contrast, mix}; + if (typeof module !== 'undefined' && module.exports) module.exports = api; + else root.HomePalette = api; +})(globalThis); diff --git a/static/js/home-palette-core.test.cjs b/static/js/home-palette-core.test.cjs new file mode 100644 index 0000000..e9f3ab4 --- /dev/null +++ b/static/js/home-palette-core.test.cjs @@ -0,0 +1,48 @@ +const test=require('node:test'), assert=require('node:assert/strict'); +const p=require('./home-palette-core.js'); +const pixels=(color,count=4096)=>new Uint8ClampedArray(Array.from({length:count},()=>color).flat()); +const rgb=hex=>[1,3,5].map(i=>parseInt(hex.slice(i,i+2),16)); +const base={bg:[17,17,17],fg:[240,240,240],accent:[176,119,255]}; +const opts={mode:'surface',strength:35,brightness:'preserve',opacity:.4,glass:.58}; +test('bounded transparent and invalid input',()=>{ + assert.equal(p.extract(pixels([0,0,0,0])),null); + assert.equal(p.extract(new Uint8Array(64*64*4+4)),null); + assert.equal(p.extract(new Uint8Array(3)),null); + assert.equal(p.extract(new Uint8Array(0)),null); +}); +test('solid colors and alpha coverage',()=>{ + assert.deepEqual(p.extract(pixels([10,70,180,255])).average,[10,70,180]); + assert.ok(Math.abs(p.extract(pixels([10,70,180,128])).coverage-128/255)<1e-10); +}); +test('colored minority is selected instead of a muddy average',()=>{ + const data=pixels([180,180,180,255]);for(let i=0;i<400*4;i+=4)data.set([20,90,220,255],i); + assert.deepEqual(p.extract(data).accent,[20,90,220]); +}); +test('off, invisible wallpaper and zero strength preserve all tokens',()=>{ + const palette=p.extract(pixels([40,90,220,255])); + for(const change of [{mode:'off'},{strength:0},{opacity:0}])assert.deepEqual(p.colors(palette,base,{...opts,...change}),{}); +}); +test('accent only never changes surfaces, brightness or semantic colors',()=>{ + const c=p.colors(p.extract(pixels([240,100,30,255])),base,{...opts,mode:'accent',brightness:'auto'}); + assert.deepEqual(Object.keys(c).sort(),['--accent','--link','--link-hover']); +}); +test('dark/light, black/white and colored wallpaper keep readable panel text',()=>{ + for(const bg of [[17,17,17],[245,245,245]])for(const color of [[0,0,0],[255,255,255],[200,30,100],[20,90,220]])for(const strength of [5,35,100]) { + const palette=p.extract(pixels([...color,255])); + const c=p.colors(palette,{...base,bg},{...opts,strength}); + const surface=rgb(c['--bg']),behind=p.mix(surface,palette.average,opts.opacity),glass=p.mix(behind,surface,opts.glass); + // Target enhanced contrast where possible; mid-tone glass can only provide + // normal contrast even with pure black/white. Allow for RGB rounding. + assert.ok(p.contrast(rgb(c['--fg']),glass)>4.4); + assert.ok(p.contrast(rgb(c['--muted']),glass)>4.4); + assert.ok(!('--danger' in c)); + assert.ok(Object.values(c).every(v=>/^#[0-9a-f]{6}$/.test(v))); + } +}); +test('auto brightness follows composited wallpaper, not invisible source pixels',()=>{ + const palette=p.extract(pixels([255,255,255,255])); + const dark=p.colors(palette,base,{...opts,brightness:'auto',opacity:.1}); + const light=p.colors(palette,base,{...opts,brightness:'auto',opacity:1}); + assert.ok(p.luminance(rgb(dark['--bg']))<.1); + assert.ok(p.luminance(rgb(light['--bg']))>.5); +}); diff --git a/static/js/home-palette.js b/static/js/home-palette.js new file mode 100644 index 0000000..ae17ad8 --- /dev/null +++ b/static/js/home-palette.js @@ -0,0 +1,78 @@ +(() => { + 'use strict'; + const config = document.querySelector('[data-home-palette]'), img = document.querySelector('body > .home-wallpaper'); + if (!config || !img || !window.HomePalette) return; + const body = document.body, core = window.HomePalette, forced = matchMedia('(forced-colors: active)'); + let options = {mode:config.dataset.mode, strength:Number(config.dataset.strength), brightness:config.dataset.brightness}; + let palette = null, pending = false, attempted = false; + const originals = new Map(); + const restore = () => { + for (const [key, value] of originals) { if (value[0]) body.style.setProperty(key,...value); else body.style.removeProperty(key); } + originals.clear(); delete body.dataset.homePaletteActive; + }; + const valid = p => p && ['average','accent'].every(k => Array.isArray(p[k]) && p[k].length === 3 && p[k].every(v => Number.isFinite(v) && v >= 0 && v <= 255)) && Number.isFinite(p.coverage) && p.coverage > 0 && p.coverage <= 1; + const cacheName = 'pageswiki.wallpaper-palette.v1'; + const key = /^[a-f0-9]{64}$/.test(config.dataset.key || '') ? config.dataset.domain + ':' + config.dataset.key : ''; + const cacheRead = () => { try { const rows = JSON.parse(sessionStorage.getItem(cacheName) || '[]'); if (!Array.isArray(rows) || rows.length > 24) return; const row = rows.find(x => x.key === key); if (row && valid(row.palette)) return row.palette; } catch {} }; + const cacheWrite = p => { + if (!key) return; + let rows=[]; + try { rows=JSON.parse(sessionStorage.getItem(cacheName) || '[]'); } catch {} + if (!Array.isArray(rows)) rows=[]; + rows=rows.filter(x => x && x.key !== key && valid(x.palette)).slice(-23); + rows.push({key,palette:p}); + try { sessionStorage.setItem(cacheName, JSON.stringify(rows)); } catch {} + }; + // Resolve custom-theme CSS colors (including color-mix) through computed style. + function baseColors() { + const probe = document.createElement('span'), canvas = document.createElement('canvas'); + canvas.width=canvas.height=1; + const ctx=canvas.getContext('2d',{willReadFrequently:true}); + probe.hidden=true; body.append(probe); + try { + const read = name => { probe.style.color=`var(--${name})`; ctx.clearRect(0,0,1,1); ctx.fillStyle=getComputedStyle(probe).color; ctx.fillRect(0,0,1,1); return [...ctx.getImageData(0,0,1,1).data].slice(0,3); }; + return {bg:read('bg'), fg:read('fg'), accent:read('accent')}; + } finally { probe.remove(); } + } + function apply() { + restore(); + if (!palette || options.mode === 'off' || !options.strength || forced.matches) return; + try { + const glass = parseFloat(getComputedStyle(body).getPropertyValue('--home-glass-opacity')) / 100; + const values=core.colors(palette,baseColors(),{...options,opacity:Number(getComputedStyle(img).opacity),glass:Number.isFinite(glass)?glass:.58}); + if (!Object.keys(values).length) return; + for (const [name,value] of Object.entries(values)) { originals.set(name,[body.style.getPropertyValue(name),body.style.getPropertyPriority(name)]); body.style.setProperty(name,value); } + body.dataset.homePaletteActive=options.mode; + } catch { restore(); } + } + function schedule() { + if (options.mode === 'off' || !options.strength || forced.matches) { restore(); return; } + if (palette) { apply(); return; } + if (!img.complete || !img.naturalWidth || pending || attempted) return; + pending=true; + const work=() => { + pending=false; + if (options.mode === 'off' || !options.strength || forced.matches) return; + attempted=true; + try { + palette=key && cacheRead(); + if (!palette) { + const canvas=document.createElement('canvas'); canvas.width=canvas.height=64; + const ctx=canvas.getContext('2d',{willReadFrequently:true}); + // Reuse the already displayed/decoded image: no second fetch or random pick. + ctx.drawImage(img,0,0,64,64); palette=core.extract(ctx.getImageData(0,0,64,64).data); + if (valid(palette)) { cacheWrite(palette); config.dataset.paletteSource='image'; } + } else config.dataset.paletteSource='cache'; + if (valid(palette)) apply(); + } catch { palette=null; restore(); } + }; + if ('requestIdleCallback' in window) requestIdleCallback(work,{timeout:1500}); else setTimeout(work,32); + } + document.addEventListener('pageswiki:home-appearance', event => { if (event.detail) options={...options,...event.detail}; schedule(); }); + document.addEventListener('pageswiki:theme',schedule); + document.addEventListener('load', event => { if (event.target instanceof HTMLLinkElement && event.target.rel === 'stylesheet') schedule(); },true); + forced.addEventListener('change',schedule); + img.addEventListener('load',schedule); + img.addEventListener('error',() => { palette=null; restore(); }); + schedule(); +})(); diff --git a/templates/pages/auth.gohtml b/templates/pages/auth.gohtml index 934370e..8d66cc2 100644 --- a/templates/pages/auth.gohtml +++ b/templates/pages/auth.gohtml @@ -1,7 +1,7 @@ {{ define "auth.gohtml" }} {{ if .CLIAuth }}{{ T "auth.cli_title" }}{{ else if .Logout }}{{ T "auth.logout" }}{{ else if .MFA }}{{ T "auth.totp" }}{{ else if .Setup }}{{ T "auth.setup" }}{{ else }}{{ T "auth.login" }}{{ end }} · {{ .WikiName }} - + {{ if .HomeWallpaperURL }}{{ end }} {{ .WikiName }} diff --git a/templates/pages/config.gohtml b/templates/pages/config.gohtml index b6baae8..c2895f5 100644 --- a/templates/pages/config.gohtml +++ b/templates/pages/config.gohtml @@ -15,7 +15,7 @@ - + @@ -107,6 +107,7 @@

{{ T "home.wallpaper_help" }}

{{ T "home.glass_help" }}

+{{ template "home-palette-controls" . }}

{{ T "home.layout_help" }}

{{ T "config.manage_bookmarks" }} → diff --git a/templates/pages/home.gohtml b/templates/pages/home.gohtml index 0426bae..db1347e 100644 --- a/templates/pages/home.gohtml +++ b/templates/pages/home.gohtml @@ -10,7 +10,7 @@ - + @@ -83,6 +83,6 @@ - +{{ template "home-appearance" . }}{{ template "home-palette" . }} {{ end }} diff --git a/templates/pages/page.gohtml b/templates/pages/page.gohtml index a1ed1f7..f94ce65 100644 --- a/templates/pages/page.gohtml +++ b/templates/pages/page.gohtml @@ -13,7 +13,7 @@ -{{ if .IsHome }}{{ end }} +{{ if .IsHome }}{{ end }} {{ if eq .ContentView.Kind "code" }} @@ -990,6 +990,6 @@ window.addEventListener("DOMContentLoaded", () => { {{ end }} - +{{ template "home-appearance" . }}{{ template "home-palette" . }} {{ end }} diff --git a/templates/pages/periodical.gohtml b/templates/pages/periodical.gohtml index dbd75b3..6331db9 100644 --- a/templates/pages/periodical.gohtml +++ b/templates/pages/periodical.gohtml @@ -1,9 +1,9 @@ -{{ define "periodical.gohtml" }}{{ .Title }} · {{ .WikiName }} -{{ if .HomeWallpaperURL }}{{ end }}
{{ .WikiName }}{{ if not .Public }}{{ template "auth-menu" . }}{{ end }}

{{ .Title }}

{{ if not .Public }}

{{ T "periodical.scope_help" }}

{{ end }} +{{ define "periodical.gohtml" }}{{ .Title }} · {{ .WikiName }} +{{ if .HomeWallpaperURL }}{{ end }}
{{ .WikiName }}{{ if not .Public }}{{ template "auth-menu" . }}{{ end }}

{{ .Title }}

{{ if not .Public }}

{{ T "periodical.scope_help" }}

{{ end }} {{ if not .Enabled }}

{{ T "periodical.disabled" }}

{{ else }}
{{ range .Entries }}{{ else }}{{ end }}
{{ T "periodical.date" }}{{ T "periodical.title" }}{{ T "config.actions" }}

{{ .Title }}

{{ if .CanEdit }}{{ end }}
{{ T "periodical.empty" }}
{{ if not .Public }}

{{ T "periodical.compose" }}

{{ T "periodical.prefix" }}: {{ .Prefix }}

{{ T "periodical.compose_help" }}

{{ T "periodical.plan" }}

{{ T "periodical.prefix" }}: {{ .Prefix }}

-

{{ T "periodical.register" }}

{{ T "periodical.registration_help" }}

{{ end }}{{ end }}
{{ end }} +

{{ T "periodical.register" }}

{{ T "periodical.registration_help" }}

{{ end }}{{ end }}
{{ template "home-appearance" . }}{{ template "home-palette" . }}{{ end }} diff --git a/templates/pages/search_home.gohtml b/templates/pages/search_home.gohtml index a5f08b8..0cf8732 100644 --- a/templates/pages/search_home.gohtml +++ b/templates/pages/search_home.gohtml @@ -8,7 +8,7 @@ {{ template "social-metadata" . }} - + {{ if .HomeWallpaperURL }}{{ end }} @@ -47,19 +47,8 @@ {{ template "home-bookmarks" . }} {{ end }} -{{ if .CanConfigureHome }} - - -
- -

{{ T "home.appearance" }}

- -

{{ T "home.glass_help" }}

-
-
-
- -{{ end }} +{{ template "home-appearance" . }} +{{ template "home-palette" . }} {{ if eq .HomeLayout "directory" }}