Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions app/javascript/controllers/composer_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,21 @@ export default class extends Controller {
#files = []

connect() {
this.#restoreDraft()

if (!this.#usingTouchDevice) {
onNextEventLoopTick(() => this.textTarget.focus())
}
}

saveDraft() {
if (this.textTarget.isBlank) {
localStorage.removeItem(this.#draftKey)
} else {
localStorage.setItem(this.#draftKey, this.textTarget.value)
}
}

submit(event) {
event.preventDefault()

Expand Down Expand Up @@ -107,6 +117,19 @@ export default class extends Controller {
this.fieldsTarget.disabled = true
}

#restoreDraft() {
const draft = localStorage.getItem(this.#draftKey)

if (draft) {
this.textTarget.value = draft
this.textTarget.selection.placeCursorAtTheEnd()
}
}

get #draftKey() {
return `composer-draft-${this.roomIdValue}`
}

get #usingTouchDevice() {
return 'ontouchstart' in window || navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
}
Expand Down Expand Up @@ -158,6 +181,7 @@ export default class extends Controller {

#reset() {
this.textTarget.value = ""
localStorage.removeItem(this.#draftKey)
}

#updateFileList() {
Expand Down
2 changes: 1 addition & 1 deletion app/views/rooms/show/_composer.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"permitted-attachment-types": "application/vnd.campfire.mention application/vnd.actiontext.opengraph-embed",
data: {
controller: "unfurl",
action: "#{rich_text_data_actions} lexxy:insert-link->unfurl#unfurl",
action: "#{rich_text_data_actions} lexxy:change->composer#saveDraft lexxy:insert-link->unfurl#unfurl",
composer_target: "text" } do %>
<%= mention_prompt_tag room %>
<% end %>
Expand Down
21 changes: 21 additions & 0 deletions test/system/composer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,27 @@ class ComposerTest < ApplicationSystemTestCase
assert_composer_empty
end

test "an unsent message is kept as a draft while hopping between rooms" do
type_in_composer "Still writing this"

join_room rooms(:hq)
assert_composer_empty

type_in_composer "And this one too"

join_room rooms(:designers)
assert_composer_text "Still writing this"

press_in_composer :enter
assert_message_text "Still writing this"

join_room rooms(:hq)
assert_composer_text "And this one too"

join_room rooms(:designers)
assert_composer_empty
end

test "markdown strikethrough survives sanitization" do
type_in_composer "Hello ~~Claude~~ World"
press_in_composer :enter
Expand Down
Loading