Skip to content

Commit

Permalink
Maintain whitespace (#678)
Browse files Browse the repository at this point in the history
  • Loading branch information
bencroker authored Feb 19, 2025
1 parent de567de commit 03d36e8
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Each tagged version of Datastar is accompanied by a release note. Read the [rele
### Changed

- Updated Idiomorph to version [0.7.1](https://github.com/bigskysoftware/idiomorph/blob/main/CHANGELOG.md#071---2025-02-13).
- Whitespace is now maintained in merged fragments ([#658](https://github.com/starfederation/datastar/issues/658)).

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion bundles/datastar-aliased.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bundles/datastar-aliased.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundles/datastar.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bundles/datastar.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion library/src/plugins/official/backend/actions/sse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export const sse = async (
argLines = []
argsRawLines[key] = argLines
}
const value = line.slice(colonIndex + 1).trim()
const value = line.slice(colonIndex + 1)
argLines.push(value)
}

Expand Down
4 changes: 2 additions & 2 deletions sdk/go/consts.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions site/routes_tests.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func setupTests(ctx context.Context, router chi.Router, signals sessions.Store)
{ID: "local_signals"},
{ID: "merge_fragment"},
{ID: "merge_fragment_signal"},
{ID: "merge_fragment_whitespace"},
{ID: "on_load"},
{ID: "ref"},
{ID: "remove_fragment"},
Expand Down Expand Up @@ -91,6 +92,7 @@ func setupTests(ctx context.Context, router chi.Router, signals sessions.Store)

if err := errors.Join(
setupTestsMergeFragment(testsRouter),
setupTestsMergeFragmentWhitespace(testsRouter),
setupTestsMergeFragmentSignal(testsRouter),
setupTestsOnLoad(testsRouter),
setupTestsRemoveFragment(testsRouter),
Expand Down
20 changes: 20 additions & 0 deletions site/routes_tests_merge_fragment_whitespace.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package site

import (
"net/http"

"github.com/go-chi/chi/v5"
datastar "github.com/starfederation/datastar/sdk/go"
)

func setupTestsMergeFragmentWhitespace(testsRouter chi.Router) error {

testsRouter.Get("/merge_fragment_whitespace/data", func(w http.ResponseWriter, r *http.Request) {
sse := datastar.NewSSE(w, r)
c := `<pre id="fragment" data-signals-result="ctx.el.innerHTML == 'foo\n bar' ? 1 : 0">foo
bar</pre>`
sse.MergeFragments(c)
})

return nil
}
9 changes: 9 additions & 0 deletions site/smoketests/merge_fragment_whitespace_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package smoketests

import (
"testing"
)

func TestMergeFragmentWhitespace(t *testing.T) {
setupPageTestOnClick(t, "tests/merge_fragment_whitespace")
}
13 changes: 13 additions & 0 deletions site/static/md/tests/merge_fragment_whitespace.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Merge Fregment Whitespace

Tests that merging a fragment maintains whitespace.

<div>
<pre id="fragment" data-signals-result="0"></pre>
<button data-on-click="@get('/tests/merge_fragment_whitespace/data')" class="btn">Merge</button>
<hr />
Result:
<code data-text="$result">0</code>
<hr />
Expected result on click: <code>1</code>
</div>

0 comments on commit 03d36e8

Please sign in to comment.