gnim 1.4.0 → 1.5.1

package/dist/gnome/jsx-runtime.ts

@@ -2,9 +2,20 @@ import Clutter from "gi://Clutter"
 import St from "gi://St"
 import GObject from "gi://GObject"
 import { configue } from "../jsx/env.js"
-import { onCleanup, Accessor, Fragment } from "../index.js"
+import {
+    onCleanup,
+    getType,
+    addChild as _add,
+    removeChild as _remove,
+    Accessor,
+    Fragment,
+} from "../index.js"
+
+function add(parent: GObject.Object, child: GObject.Object, index: number) {
+    if (_add in parent && typeof parent[_add] === "function") {
+        parent[_add](child, getType(child), index)
+    }
 
-function add(parent: GObject.Object, child: GObject.Object, _: number) {
     if (parent instanceof Clutter.Actor) {
         if (child instanceof Clutter.Action) {
             return parent.add_action(child)
@@ -24,6 +35,11 @@ function add(parent: GObject.Object, child: GObject.Object, _: number) {
 }
 
 function remove(parent: GObject.Object, child: GObject.Object) {
+    if (_remove in parent && typeof parent[_remove] === "function") {
+        parent[_remove](child)
+        return
+    }
+
     if (child instanceof Clutter.Actor && parent instanceof Clutter.Actor) {
         return parent.remove_child(child)
     }

package/dist/gtk3/jsx-runtime.ts

@@ -1,7 +1,14 @@
 import Gtk from "gi://Gtk?version=3.0"
 import GObject from "gi://GObject"
 import { configue } from "../jsx/env.js"
-import { getType, onCleanup, Accessor, Fragment } from "../index.js"
+import {
+    getType,
+    onCleanup,
+    addChild as _add,
+    removeChild as _remove,
+    Accessor,
+    Fragment,
+} from "../index.js"
 
 const dummyBuilder = new Gtk.Builder()
 
@@ -11,13 +18,12 @@ function add(parent: Gtk.Buildable, child: GObject.Object, _: number) {
     }
 }
 
-function specialRemove(_parent: GObject.Object, _child: GObject.Object) {
-    // TODO: add any special case
-    return false
-}
+function specialAdd(parent: GObject.Object, child: GObject.Object, index: number) {
+    if (_add in parent && typeof parent[_add] === "function") {
+        parent[_add](child, getType(child), index)
+        return true
+    }
 
-function specialAdd(parent: GObject.Object, child: GObject.Object, _: number) {
-    // TODO: add any other special case
     if (
         child instanceof Gtk.Adjustment &&
         "set_adjustment" in parent &&
@@ -52,7 +58,10 @@ function specialAdd(parent: GObject.Object, child: GObject.Object, _: number) {
 }
 
 function remove(parent: GObject.Object, child: GObject.Object) {
-    if (specialRemove(parent, child)) return
+    if (_remove in parent && typeof parent[_remove] === "function") {
+        parent[_remove](child)
+        return
+    }
 
     if (parent instanceof Gtk.Container && child instanceof Gtk.Widget) {
         return parent.remove(child)

package/dist/gtk4/jsx-runtime.ts

@@ -1,8 +1,15 @@
 import Gtk from "gi://Gtk?version=4.0"
 import Gio from "gi://Gio?version=2.0"
 import GObject from "gi://GObject"
-import { getType, onCleanup, Accessor, Fragment } from "../index.js"
 import { configue } from "../jsx/env.js"
+import {
+    getType,
+    onCleanup,
+    addChild as _add,
+    removeChild as _remove,
+    Accessor,
+    Fragment,
+} from "../index.js"
 
 const dummyBuilder = new Gtk.Builder()
 
@@ -12,13 +19,12 @@ function add(parent: Gtk.Buildable, child: GObject.Object, _: number) {
     }
 }
 
-function specialRemove(_parent: GObject.Object, _child: GObject.Object) {
-    // TODO: add any special case
-    return false
-}
+function specialAdd(parent: GObject.Object, child: GObject.Object, index: number) {
+    if (_add in parent && typeof parent[_add] === "function") {
+        parent[_add](child, getType(child), index)
+        return true
+    }
 
-function specialAdd(parent: GObject.Object, child: GObject.Object, _: number) {
-    // TODO: add any other special case
     if (
         child instanceof Gtk.Adjustment &&
         "set_adjustment" in parent &&
@@ -69,8 +75,16 @@ function specialAdd(parent: GObject.Object, child: GObject.Object, _: number) {
     return false
 }
 
+// `set_child` and especially `remove` might be way too generic and there might
+// be cases where it does not actually do what we want it to do
+//
+// if there is a usecase for either of these two that does something else than
+// we expect it to do here in a JSX context we have to check for known instances
 function remove(parent: GObject.Object, child: GObject.Object) {
-    if (specialRemove(parent, child)) return
+    if (_remove in parent && typeof parent[_remove] === "function") {
+        parent[_remove](child)
+        return
+    }
 
     if (parent instanceof Gtk.Widget && child instanceof Gtk.EventController) {
         return parent.remove_controller(child)

package/dist/index.ts

@@ -1,4 +1,12 @@
-export { type Node, type CCProps, type FCProps, getType, jsx } from "./jsx/jsx.js"
+export {
+    type Node,
+    type CCProps,
+    type FCProps,
+    getType,
+    jsx,
+    addChild,
+    removeChild,
+} from "./jsx/jsx.js"
 export { Fragment } from "./jsx/Fragment.js"
 export { For } from "./jsx/For.js"
 export { With } from "./jsx/With.js"

package/dist/jsx/jsx.ts

@@ -19,6 +19,36 @@ export type Node =
 
 export const gtkType = Symbol("gtk builder type")
 
+/**
+ * Special symbol which lets you implement how widgets are appended in JSX.
+ *
+ * Example:
+ *
+ * ```ts
+ * class MyComponent extends GObject.Object {
+ *   [addChild](child: GObject.Object, type: string | null, index: number) {
+ *     // implement
+ *   }
+ * }
+ * ```
+ */
+export const addChild = Symbol("JSX add child method")
+
+/**
+ * Special symbol which lets you implement how widgets are removed in JSX.
+ *
+ * Example:
+ *
+ * ```ts
+ * class MyComponent extends GObject.Object {
+ *   [removeChild](child: GObject.Object) {
+ *     // implement
+ *   }
+ * }
+ * ```
+ */
+export const removeChild = Symbol("JSX add remove method")
+
 /**
  * Get the type of the object specified through the `$type` property
  */

package/dist/resource.xml

@@ -6,9 +6,7 @@
     --alias:gnim/dbus=resource:///gnim/dbus.js
     --alias:gnim/gobject=resource:///gnim/gobject.js
     --alias:gnim/gtk4/jsx-runtime=resource:///gnim/gtk4/jsx-runtime.js
-    --alias:gnim/gtk4/style=resource:///gnim/gtk4/style.js
     --alias:gnim/gtk3/jsx-runtime=resource:///gnim/gtk3/jsx-runtime.js
-    --alias:gnim/gtk3/style=resource:///gnim/gtk3/style.js
     --alias:gnim/gnome/jsx-runtime=resource:///gnim/gnome/jsx-runtime.js
   -->
 
@@ -40,14 +38,6 @@
     declare module "resource:///gnim/gtk3/jsx-runtime.js" {
       export * from "gnim/gtk3/jsx-runtime"
     }
-
-    declare module "resource:///gnim/gtk4/style.js" {
-      export * from "gnim/gtk4/style"
-    }
-
-    declare module "resource:///gnim/gtk3/style.js" {
-      export * from "gnim/gtk3/style"
-    }
   -->
   <gresource prefix="/gnim">
     <file>dbus.js</file>
@@ -56,14 +46,10 @@
     <file>util.js</file>
     <file>index.js</file>
 
-    <file>gnome/jsx-runtime.js</file>
     <file>gnome/signalTracker.js</file>
-
+    <file>gnome/jsx-runtime.js</file>
     <file>gtk3/jsx-runtime.js</file>
-    <file>gtk3/style.js</file>
-
     <file>gtk4/jsx-runtime.js</file>
-    <file>gtk4/style.js</file>
 
     <file>jsx/env.js</file>
     <file>jsx/For.js</file>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gnim",
-    "version": "1.4.0",
+    "version": "1.5.1",
     "type": "module",
     "author": "Aylur",
     "license": "MIT",
@@ -40,9 +40,7 @@
         "./resource": "./dist/resource/resource.ts",
         "./gnome/jsx-runtime": "./dist/gnome/jsx-runtime.ts",
         "./gtk3/jsx-runtime": "./dist/gtk3/jsx-runtime.ts",
-        "./gtk3/style": "./dist/gtk3/style.ts",
-        "./gtk4/jsx-runtime": "./dist/gtk4/jsx-runtime.ts",
-        "./gtk4/style": "./dist/gtk4/style.ts"
+        "./gtk4/jsx-runtime": "./dist/gtk4/jsx-runtime.ts"
     },
     "files": [
         "dist"

package/dist/gtk3/style.ts

@@ -1,35 +0,0 @@
-import Gtk from "gi://Gtk?version=3.0"
-import Gdk from "gi://Gdk?version=3.0"
-
-const stylesheets: string[] = []
-
-/** @experimental */
-export function apply() {
-    const provider = new Gtk.CssProvider()
-
-    try {
-        provider.load_from_data(stylesheets.join(" "))
-    } catch (err) {
-        logError(err)
-    }
-
-    const screen = Gdk.Screen.get_default()
-    if (!screen) {
-        throw Error("Could not get default Gdk.Screen")
-    }
-
-    Gtk.StyleContext.add_provider_for_screen(screen, provider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
-
-    return () => {
-        Gtk.StyleContext.remove_provider_for_screen(screen, provider)
-    }
-}
-
-export function css(css: TemplateStringsArray, ...values: any[]): void
-export function css(css: string): void
-export function css(css: TemplateStringsArray | string, ...values: any[]) {
-    const style =
-        typeof css === "string" ? css : css.flatMap((str, i) => str + `${values[i] ?? ""}`).join("")
-
-    stylesheets.push(style)
-}

package/dist/gtk4/style.ts

@@ -1,35 +0,0 @@
-import Gtk from "gi://Gtk?version=4.0"
-import Gdk from "gi://Gdk?version=4.0"
-
-const stylesheets: string[] = []
-
-/** @experimental */
-export function apply() {
-    const provider = new Gtk.CssProvider()
-
-    try {
-        provider.load_from_string(stylesheets.join(" "))
-    } catch (err) {
-        logError(err)
-    }
-
-    const display = Gdk.Display.get_default()
-    if (!display) {
-        throw Error("Could not get default Gdk.Display")
-    }
-
-    Gtk.StyleContext.add_provider_for_display(display, provider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
-
-    return () => {
-        Gtk.StyleContext.remove_provider_for_display(display, provider)
-    }
-}
-
-export function css(css: TemplateStringsArray, ...values: any[]): void
-export function css(css: string): void
-export function css(css: TemplateStringsArray | string, ...values: any[]) {
-    const style =
-        typeof css === "string" ? css : css.flatMap((str, i) => str + `${values[i] ?? ""}`).join("")
-
-    stylesheets.push(style)
-}