diff --git a/element/main.go b/element/main.go
index 64003ec..f3ad6d3 100644
--- a/element/main.go
+++ b/element/main.go
@@ -15,10 +14,0 @@ type Node struct {
- TagName string
- Parent *Node
- Children []Node
- Style map[string]string
- PrevSibling *Node
- NextSibling *Node
- Properties Properties
-}
-
-type Properties struct {
@@ -26,0 +17,4 @@ type Properties struct {
+ TagName string
+ Parent *Node
+ Children []Node
+ Style map[string]string
@@ -35 +28,0 @@ type Properties struct {
- EventListeners map[string][]func(Event)
@@ -38,0 +32,3 @@ type Properties struct {
+ PrevSibling *Node
+ NextSibling *Node
+ EventListeners map[string][]func(Event)
@@ -102 +98 @@ func (n *Node) GetAttribute(name string) string {
- for _, attr := range n.Properties.Node.Attr {
+ for _, attr := range n.Node.Attr {
@@ -110 +106 @@ func (n *Node) SetAttribute(key, value string) {
- for i, attr := range n.Properties.Node.Attr {
+ for i, attr := range n.Node.Attr {
@@ -113 +109 @@ func (n *Node) SetAttribute(key, value string) {
- n.Properties.Node.Attr[i].Val = value
+ n.Node.Attr[i].Val = value
@@ -119 +115 @@ func (n *Node) SetAttribute(key, value string) {
- n.Properties.Node.Attr = append(n.Properties.Node.Attr, html.Attribute{
+ n.Node.Attr = append(n.Node.Attr, html.Attribute{
@@ -149 +145 @@ func (n *Node) QuerySelector(selectString string) *Node {
- if cr.Properties.Id != "" {
+ if cr.Id != "" {
@@ -171 +167 @@ func (node *Node) InnerText() string {
- getText(node.Properties.Node)
+ getText(node.Node)
@@ -179 +175 @@ func TestSelector(selectString string, n *Node) bool {
- selectors := selector.GetCSSSelectors(n.Properties.Node, []string{})
+ selectors := selector.GetCSSSelectors(n.Node, []string{})
@@ -199,2 +195,2 @@ func (node *Node) AddEventListener(name string, callback func(Event)) {
- if node.Properties.EventListeners == nil {
- node.Properties.EventListeners = make(map[string][]func(Event))
+ if node.EventListeners == nil {
+ node.EventListeners = make(map[string][]func(Event))
@@ -202,2 +198,2 @@ func (node *Node) AddEventListener(name string, callback func(Event)) {
- if node.Properties.EventListeners[name] == nil {
- node.Properties.EventListeners[name] = []func(Event){}
+ if node.EventListeners[name] == nil {
+ node.EventListeners[name] = []func(Event){}
@@ -205 +201 @@ func (node *Node) AddEventListener(name string, callback func(Event)) {
- node.Properties.EventListeners[name] = append(node.Properties.EventListeners[name], callback)
+ node.EventListeners[name] = append(node.EventListeners[name], callback)
package element
import (
"gui/selector"
"image"
ic "image/color"
"strings"
"golang.org/x/image/font"
"golang.org/x/net/html"
)
type Node struct {
TagName string
Parent *Node
Children []Node
Style map[string]string
PrevSibling *Node
NextSibling *Node
Properties Properties
}
type Properties struct {
Node *html.Node
Type html.NodeType
Id string
X float32
Y float32
Width float32
Height float32
Margin Margin
Padding Padding
Border Border
EventListeners map[string][]func(Event)
EM float32
Text Text
Colors Colors
}
type Margin struct {
Top float32
Right float32
Bottom float32
Left float32
}
type Padding struct {
Top float32
Right float32
Bottom float32
Left float32
}
type Border struct {
Width string
Style string
Color ic.RGBA
Radius string
}
type Text struct {
Text string
Font font.Face
Color ic.RGBA
Image *image.RGBA
Underlined bool
Overlined bool
LineThrough bool
DecorationColor ic.RGBA
DecorationThickness int
Align string
Indent int // very low priority
LetterSpacing int
LineHeight int
WordSpacing int
WhiteSpace string
Shadows []Shadow // need
Width int
WordBreak string
EM int
X int
}
type Shadow struct {
X int
Y int
Blur int
Color ic.RGBA
}
// Color represents an RGBA color
type Colors struct {
Background ic.RGBA
Font ic.RGBA
TextDecoration ic.RGBA
}
func (n *Node) GetAttribute(name string) string {
attributes := make(map[string]string)
for _, attr := range n.Properties.Node.Attr {
attributes[attr.Key] = attr.Val
}
return attributes[name]
}
func (n *Node) SetAttribute(key, value string) {
// Iterate through the attributes
for i, attr := range n.Properties.Node.Attr {
// If the attribute key matches, update its value
if attr.Key == key {
n.Properties.Node.Attr[i].Val = value
return
}
}
// If the attribute key was not found, add a new attribute
n.Properties.Node.Attr = append(n.Properties.Node.Attr, html.Attribute{
Key: key,
Val: value,
})
}
func (n *Node) QuerySelectorAll(selectString string) *[]*Node {
results := []*Node{}
if TestSelector(selectString, n) {
results = append(results, n)
}
for i := range n.Children {
el := &n.Children[i]
cr := el.QuerySelectorAll(selectString)
if len(*cr) > 0 {
results = append(results, *cr...)
}
}
return &results
}
func (n *Node) QuerySelector(selectString string) *Node {
if TestSelector(selectString, n) {
return n
}
for i := range n.Children {
el := &n.Children[i]
cr := el.QuerySelector(selectString)
if cr.Properties.Id != "" {
return cr
}
}
return &Node{}
}
func (node *Node) InnerText() string {
var result strings.Builder
var getText func(*html.Node)
getText = func(n *html.Node) {
if n.Type == html.TextNode {
result.WriteString(n.Data)
}
for c := n.FirstChild; c != nil; c = c.NextSibling {
getText(c)
}
}
getText(node.Properties.Node)
return result.String()
}
func TestSelector(selectString string, n *Node) bool {
parts := strings.Split(selectString, ">")
selectors := selector.GetCSSSelectors(n.Properties.Node, []string{})
part := selector.SplitSelector(strings.TrimSpace(parts[len(parts)-1]))
has := selector.Contains(part, selectors)
if len(parts) == 1 || !has {
return has
} else {
return TestSelector(strings.Join(parts[0:len(parts)-1], ">"), n.Parent)
}
}
type Event struct {
X int
Y int
Click bool
}
func (node *Node) AddEventListener(name string, callback func(Event)) {
if node.Properties.EventListeners == nil {
node.Properties.EventListeners = make(map[string][]func(Event))
}
if node.Properties.EventListeners[name] == nil {
node.Properties.EventListeners[name] = []func(Event){}
}
node.Properties.EventListeners[name] = append(node.Properties.EventListeners[name], callback)
}