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
18 changes: 0 additions & 18 deletions src/actions/ensureSettingsThought.ts

This file was deleted.

16 changes: 13 additions & 3 deletions src/actions/settings.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import _ from 'lodash'
import State from '../@types/State'
import Thunk from '../@types/Thunk'
import { EM_TOKEN, SETTINGS_VALUE } from '../constants'
import { EM_TOKEN, SETTINGS_TOKEN, SETTINGS_VALUE } from '../constants'
import findDescendant from '../selectors/findDescendant'
import getPrevRank from '../selectors/getPrevRank'
import { registerActionMetadata } from '../util/actionMetadata.registry'
import ensureSettingsThought from './ensureSettingsThought'
import createThought from './createThought'
import toggleAttribute from './toggleAttribute'

/** Sets a setting thought. */
Expand All @@ -13,7 +14,16 @@ const settings = (state: State, { key, value }: { key: string; value: string })
const exists = !!findDescendant(state, EM_TOKEN, emContext)
if (exists) return state

return toggleAttribute(ensureSettingsThought(state), { path: [EM_TOKEN], values: emContext })
const stateWithSettings = findDescendant(state, EM_TOKEN, SETTINGS_VALUE)
? state
: createThought(state, {
id: SETTINGS_TOKEN,
path: [EM_TOKEN],
value: SETTINGS_VALUE,
rank: getPrevRank(state, EM_TOKEN),
})

return toggleAttribute(stateWithSettings, { path: [EM_TOKEN], values: emContext })
}

/** Action-creator for settings. */
Expand Down