Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(client): improve inspector UI of Map data type #220

Merged
merged 3 commits into from
Feb 4, 2024
Merged

feat(client): improve inspector UI of Map data type #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f4c545
feat: Use Object UI to display native Map
Azurewarth0920 Feb 3, 2024
61d03a8
fix: Fix edit on native Map
Azurewarth0920 Feb 3, 2024
eedc8fc
feat: Use fromEntries to convert Map to object
Azurewarth0920 Feb 3, 2024
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
8 changes: 1 addition & 7 deletions packages/devtools-kit/src/core/component/state/custom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,7 @@ export function getBigIntDetails(val: bigint | bigint) {
}

export function getMapDetails(val: Map<string, unknown>) {
const list: Array<Record<string, unknown>> = []
val.forEach(
(value, key) => list.push({
key,
value,
}),
)
const list: Record<string, unknown> = Object.fromEntries(val)
return {
_custom: {
type: 'map',
Expand Down
19 changes: 13 additions & 6 deletions packages/devtools-kit/src/core/component/state/editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ export class StateEditor {
const markRef = false
while (sections.length > 1) {
const section = sections.shift()!
object = object[section] as Recordable
if (object instanceof Map)
object = object.get(section) as Recordable
else
object = object[section] as Recordable
if (this.refEditor.isRef(object))
object = this.refEditor.get(object)
}
Expand All @@ -42,7 +45,10 @@ export class StateEditor {
get(object: Recordable, path: PropPath) {
const sections = Array.isArray(path) ? path : path.split('.')
for (let i = 0; i < sections.length; i++) {
object = object[sections[i]] as Recordable
if (object instanceof Map)
object = object.get(sections[i]) as Recordable
else
object = object[sections[i]] as Recordable
if (this.refEditor.isRef(object))
object = this.refEditor.get(object)
if (!object)
Expand Down Expand Up @@ -70,17 +76,18 @@ export class StateEditor {
if (state.remove || state.newKey) {
if (Array.isArray(object))
object.splice(field as number, 1)
else if (toRaw(object) instanceof Map && typeof value === 'object' && value && 'key' in value)
object.delete(value.key)
else if (toRaw(object) instanceof Map)
object.delete(field)
else if (toRaw(object) instanceof Set)
object.delete(value)
else
Reflect.deleteProperty(object, field)
else Reflect.deleteProperty(object, field)
}
if (!state.remove) {
const target = object[state.newKey || field]
if (this.refEditor.isRef(target))
this.refEditor.set(target, value)
else if (toRaw(object) instanceof Map)
object.set(state.newKey || field, value)
else
object[state.newKey || field] = value
}
Expand Down
Loading