fix: remove every occurrence of a repeated class

RemoveClass deleted each class with one strings.ReplaceAll pass over the
space-wrapped class list. Two adjacent occurrences share the space
between them, so " a a " holds only one non-overlapping " a " and the
second survived: RemoveClass("a") on class="a a" returned with
HasClass("a") still true. ToggleClass used the same expression and so
toggled such a class the wrong way.

Replace one occurrence at a time, re-scanning from the start, in a helper
shared by both call sites. Whitespace between the remaining classes is
untouched.
This commit is contained in:
dualfroz
2026-09-06 00:44:19 +02:00
committed by DualFroz
parent 4a4f1326fa
commit b4ef68dec8
2 changed files with 76 additions and 4 deletions
+17 -4
View File
@@ -167,7 +167,7 @@ func (s *Selection) RemoveClass(class ...string) *Selection {
} else {
classes, attr := getClassesAndAttr(n)
for _, rcl := range rclasses {
classes = strings.ReplaceAll(classes, " "+rcl+" ", " ")
classes = removeClassFromClasses(classes, rcl)
}
setClasses(n, attr, classes)
@@ -191,9 +191,8 @@ func (s *Selection) ToggleClass(class ...string) *Selection {
for _, n := range s.Nodes {
classes, attr := getClassesAndAttr(n)
for _, tcl := range tcls {
spaceAroundTcl := " " + tcl + " "
if strings.Contains(classes, spaceAroundTcl) {
classes = strings.ReplaceAll(classes, spaceAroundTcl, " ")
if strings.Contains(classes, " "+tcl+" ") {
classes = removeClassFromClasses(classes, tcl)
} else {
classes += tcl + " "
}
@@ -205,6 +204,20 @@ func (s *Selection) ToggleClass(class ...string) *Selection {
return s
}
// removeClassFromClasses removes every occurrence of cl from the normalized
// class string. One ReplaceAll pass is not enough: adjacent occurrences
// share the space between them, so " a a " holds only one " a ".
func removeClassFromClasses(classes, cl string) string {
target := " " + cl + " "
for {
replaced := strings.Replace(classes, target, " ", 1)
if replaced == classes {
return classes
}
classes = replaced
}
}
func getAttributePtr(attrName string, n *html.Node) *html.Attribute {
if n == nil {
return nil
+59
View File
@@ -250,3 +250,62 @@ func TestToggleClass(t *testing.T) {
t.Errorf("Expected #nf1 to have no classes, have %q", a)
}
}
func TestRemoveClassRepeatedInSource(t *testing.T) {
cases := []struct {
class string
remove string
expected string
}{
{"a a", "a", ""},
{"a a a", "a", ""},
{"a b a", "a", "b"},
{"a b a b", "a", "b b"},
{"a b a b", "a b", ""},
{"a a b", "a", "b"},
{"b a a", "a", "b"},
}
for _, c := range cases {
doc, err := NewDocumentFromReader(strings.NewReader(`<div id="t" class="` + c.class + `"></div>`))
if err != nil {
t.Fatal(err)
}
sel := doc.Find("#t")
sel.RemoveClass(c.remove)
got, _ := sel.Attr("class")
if got != c.expected {
t.Errorf("class=%q RemoveClass(%q): got class %q, want %q", c.class, c.remove, got, c.expected)
}
for _, removed := range strings.Fields(c.remove) {
if sel.HasClass(removed) {
t.Errorf("class=%q RemoveClass(%q): still has class %q", c.class, c.remove, removed)
}
}
}
}
func TestToggleClassRepeatedInSource(t *testing.T) {
doc, err := NewDocumentFromReader(strings.NewReader(`<div id="t" class="a a b"></div>`))
if err != nil {
t.Fatal(err)
}
sel := doc.Find("#t")
sel.ToggleClass("a")
if sel.HasClass("a") {
t.Error("expected #t to not have class a after toggling it off")
}
if !sel.HasClass("b") {
t.Error("expected #t to keep class b")
}
sel.ToggleClass("a")
if !sel.HasClass("a") {
t.Error("expected #t to have class a after toggling it back on")
}
}