diff --git a/packages/chrome/src/App.tsx b/packages/chrome/src/App.tsx index e75aba54..dd076fc6 100644 --- a/packages/chrome/src/App.tsx +++ b/packages/chrome/src/App.tsx @@ -5,7 +5,7 @@ import type { Tab } from "./Tab"; import { BookmarksStrip } from "./components/BookmarksStrip"; import { Omnibar } from "./components/Omnibar/Omnibar"; -export function App(_, cx: ComponentContext) { +export function App(props: {}, cx: ComponentContext) { const applyTheme = () => { let theme = browser.settings.theme; @@ -45,7 +45,7 @@ export function App(_, cx: ComponentContext) { }} /> - {use(browser.activetab.url, browser.settings.bookmarksPinned) + {use(browser.activetab.url, browser.settings.showBookmarksBar) .map(([u, pinned]) => pinned || u.href === "puter://newtab") .andThen()}
diff --git a/packages/chrome/src/Browser.tsx b/packages/chrome/src/Browser.tsx index 26ed0db0..161afaef 100644 --- a/packages/chrome/src/Browser.tsx +++ b/packages/chrome/src/Browser.tsx @@ -62,7 +62,6 @@ export type Settings = { startupPage: "new-tab" | "continue"; defaultZoom: number; showBookmarksBar: boolean; - bookmarksPinned: boolean; defaultSearchEngine: | "google" | "bing" @@ -98,7 +97,6 @@ export class Browser extends StatefulClass { startupPage: "new-tab", defaultZoom: 100, showBookmarksBar: true, - bookmarksPinned: false, defaultSearchEngine: "google", searchSuggestionsEnabled: true, blockTrackers: true, @@ -219,11 +217,16 @@ export class Browser extends StatefulClass { state.deserialize(s); return state; }); - for (let detab of de.tabs) { - let tab = this.newTab(); - tab.deserialize(detab); - tab.history.justTriggeredNavigation = true; - tab.history.go(0, false); + + if (de.settings.startupPage === "continue") { + for (let detab of de.tabs) { + let tab = this.newTab(); + tab.deserialize(detab); + tab.history.justTriggeredNavigation = true; + tab.history.go(0, false); + } + } else { + this.tabs[0] = this.newTab(); } this.activetab = this.tabs[0]; this.bookmarks = de.bookmarks.map(createState); diff --git a/packages/chrome/src/assets/favicon.ts b/packages/chrome/src/assets/favicon.ts index fa519c95..c74a6145 100644 --- a/packages/chrome/src/assets/favicon.ts +++ b/packages/chrome/src/assets/favicon.ts @@ -1,3 +1,3 @@ -import defaultFavicon from "../../public/defaultfavicon.png"; +import defaultFavicon from "/defaultfavicon.png"; export const defaultFaviconUrl = defaultFavicon; diff --git a/packages/chrome/src/components/BookmarkPopup.tsx b/packages/chrome/src/components/BookmarkPopup.tsx index fabf392c..0b3870a3 100644 --- a/packages/chrome/src/components/BookmarkPopup.tsx +++ b/packages/chrome/src/components/BookmarkPopup.tsx @@ -5,56 +5,44 @@ import { Input } from "./Input"; import { closeMenu } from "./Menu"; import { Button } from "./Button"; -export function BookmarkPopup(s: { +export function BookmarkPopup(props: { bookmark: Stateful; new: boolean; }) { return (
-
{s.new ? "Add Bookmark" : "Edit Bookmark"}
+
{props.new ? "Add Bookmark" : "Edit Bookmark"}
- - (s.bookmark.title = (e.target as HTMLInputElement).value) - } - /> +
- - (s.bookmark.url = (e.target as HTMLInputElement).value) - } - /> +
diff --git a/packages/chrome/src/components/BookmarksStrip.tsx b/packages/chrome/src/components/BookmarksStrip.tsx index cad6daf5..1e6ee6ca 100644 --- a/packages/chrome/src/components/BookmarksStrip.tsx +++ b/packages/chrome/src/components/BookmarksStrip.tsx @@ -5,7 +5,7 @@ import { browser, type BookmarkEntry } from "../Browser"; import { createMenu, createMenuCustom, setContextMenu } from "./Menu"; import { BookmarkPopup } from "./BookmarkPopup"; -export function BookmarksStrip(_, cx: ComponentContext) { +export function BookmarksStrip(props: {}, cx: ComponentContext) { cx.mount = () => { setContextMenu(cx.root, [ { @@ -15,11 +15,11 @@ export function BookmarksStrip(_, cx: ComponentContext) { }, { label: "Pin Bookmarks Strip", - checkbox: use(browser.settings.bookmarksPinned), + checkbox: use(browser.settings.showBookmarksBar), }, ]); }; - + console.log(browser.bookmarks); return (