-
-
Notifications
You must be signed in to change notification settings - Fork 33
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ej/fix persisted store #746
Merged
Merged
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
108cf02
Revert "add SettingsMenu tabs component (WIP)"
lightlii 8fbdd3f
Revert "add settings menu tab"
lightlii 5f7d37d
Merge branch 'master' of github.com:digidem/mapeo-desktop
lightlii 7fed094
Merge branch 'master' of github.com:digidem/mapeo-desktop
lightlii 7753f87
Merge branch 'master' of github.com:digidem/mapeo-desktop
lightlii 99e3c16
Merge branch 'master' of github.com:digidem/mapeo-desktop
lightlii b434580
fix: restore setting persisted storage async
lightlii 06c68b8
fix: make saved types in config consistent
lightlii c8c0848
fix: revert async await again (??) problem appears to be the format t…
lightlii 6aa6578
fix: revert zustand serialisation stuf... persisted store working cor…
lightlii 92f3970
fix: remove typings for `getItem`, `setItem`, and `removeItem`
lightlii File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,15 +12,20 @@ const storage = { | |
* @returns {string | null} | ||
*/ | ||
getItem: key => { | ||
return /** @type {string | null} */ (store.get(key)) || null | ||
const item = store.get(key) | ||
return item ? JSON.stringify(item) : null | ||
}, | ||
/** | ||
* @param {string} key - A string key to reference the stored item by. | ||
* @param {string} state - The state to be persisted - stringified JSON. | ||
* @returns {void} | ||
*/ | ||
setItem: (key, state) => { | ||
store.set(key, JSON.parse(state)) | ||
if (typeof state === 'string') { | ||
store.set(key, JSON.parse(state)) | ||
} else { | ||
store.set(key, state) | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. with some more testing, it seems like zustand will automatically create your object into a string (so you don't need to do this typecheck) |
||
}, | ||
/** | ||
* @param {string} key - A string key to reference the stored item to be removed. | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
based on the typescript typings, it looks like get item has to return a string, and I assume
createJSONStorage
then just turns it back to an object...its seems like it is working.playing around with it, I also realize that
getItem
,setItem
, andremoveItem
don't need jsdoc typings, those are encapasulated it typing of the 'storage'