Merge pull request 903

mobxjs · Apr 1, 2017 · 1b229f5 · 1b229f5
2 parents e140aad + 7f4a20a
commit 1b229f5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/types/observablemap.ts b/src/types/observablemap.ts
@@ -73,8 +73,8 @@ export type IObservableMapInitialValues<V> = IMapEntries<V> | IKeyValueMap<V> |
 
 export class ObservableMap<V> implements IInterceptable<IMapWillChange<V>>, IListenable, IMap<string, V> {
 	$mobx = ObservableMapMarker;
-	private _data: { [key: string]: ObservableValue<V | undefined> } = {};
-	private _hasMap: { [key: string]: ObservableValue<boolean> } = {}; // hasMap, not hashMap >-).
+	private _data: { [key: string]: ObservableValue<V | undefined> } = Object.create(null);
+	private _hasMap: { [key: string]: ObservableValue<boolean> } = Object.create(null); // hasMap, not hashMap >-).
 	private _keys: IObservableArray<string> = <any> new ObservableArray(undefined, referenceEnhancer, `${this.name}.keys()`, true);
 	interceptors = null;
 	changeListeners = null;

diff --git a/test/map.js b/test/map.js
@@ -603,3 +603,20 @@ test('using deep map', t => {
 
   t.end();
 });
+
+test("issue 893", t => {
+  const m = mobx.observable.map();
+  const keys = ['constructor', 'toString', 'assertValidKey', 'isValidKey', 'toJSON', 'toJS']
+  for (let key of keys) {
+	  t.equal(m.get(key), undefined);
+  }
+  t.end();
+});
+
+test("work with 'toString' key", t => {
+	const m = mobx.observable.map();
+	t.equal(m.get('toString'), undefined);
+	m.set('toString', 'test');
+	t.equal(m.get('toString'), 'test');
+	t.end();
+});