merged physics with master

2 files changed, 20 insertions, 20 deletions

diff --git a/src/client/util/Import & Export/DirectoryImportBox.tsx b/src/client/util/Import & Export/DirectoryImportBox.tsx
index 7f0c8a3e8..b9bb22564 100644
--- a/src/client/util/Import & Export/DirectoryImportBox.tsx
+++ b/src/client/util/Import & Export/DirectoryImportBox.tsx
@@ -14,12 +14,14 @@ import { AcceptableMedia, Upload } from '../../../server/SharedMediaTypes';
 import { Utils } from '../../../Utils';
 import { GooglePhotos } from '../../apis/google_docs/GooglePhotosClientUtils';
 import { Docs, DocumentOptions, DocUtils } from '../../documents/Documents';
+import { DocumentType } from '../../documents/DocumentTypes';
 import { Networking } from '../../Network';
 import { FieldView, FieldViewProps } from '../../views/nodes/FieldView';
 import { DocumentManager } from '../DocumentManager';
 import './DirectoryImportBox.scss';
 import ImportMetadataEntry, { keyPlaceholder, valuePlaceholder } from './ImportMetadataEntry';
 import React = require('react');
+import _ = require('lodash');
 
 const unsupported = ['text/html', 'text/plain'];
 
@@ -155,8 +157,8 @@ export class DirectoryImportBox extends React.Component<FieldViewProps> {
             x: NumCast(doc.x),
             y: NumCast(doc.y) + offset,
         };
-        const parent = this.props.ContainingCollectionView;
-        if (parent) {
+        const parent = this.props.DocumentView?.().props.docViewPath().lastElement();
+        if (parent?.rootDoc.type === DocumentType.COL) {
             let importContainer: Doc;
             if (docs.length < 50) {
                 importContainer = Docs.Create.MasonryDocument(docs, options);
@@ -168,7 +170,7 @@ export class DirectoryImportBox extends React.Component<FieldViewProps> {
             await GooglePhotos.Export.CollectionToAlbum({ collection: importContainer });
             Doc.AddDocToList(Doc.GetProto(parent.props.Document), 'data', importContainer);
             !this.persistent && this.props.removeDocument && this.props.removeDocument(doc);
-            DocumentManager.Instance.jumpToDocument(importContainer, { willPanZoom: true }, undefined, []);
+            DocumentManager.Instance.showDocument(importContainer, { willZoomCentered: true });
         }
 
         runInAction(() => {
diff --git a/src/client/util/Import & Export/ImageUtils.ts b/src/client/util/Import & Export/ImageUtils.ts
index 9bd92a316..55d37f544 100644
--- a/src/client/util/Import & Export/ImageUtils.ts
+++ b/src/client/util/Import & Export/ImageUtils.ts
@@ -1,12 +1,11 @@
-import { Doc } from "../../../fields/Doc";
-import { ImageField } from "../../../fields/URLField";
-import { Cast, StrCast, NumCast } from "../../../fields/Types";
-import { Networking } from "../../Network";
-import { Id } from "../../../fields/FieldSymbols";
-import { Utils } from "../../../Utils";
+import { Doc } from '../../../fields/Doc';
+import { ImageField } from '../../../fields/URLField';
+import { Cast, StrCast, NumCast } from '../../../fields/Types';
+import { Networking } from '../../Network';
+import { Id } from '../../../fields/FieldSymbols';
+import { Utils } from '../../../Utils';
 
 export namespace ImageUtils {
-
     export const ExtractExif = async (document: Doc): Promise<boolean> => {
         const field = Cast(document.data, ImageField);
         if (!field) {
@@ -17,23 +16,22 @@ export namespace ImageUtils {
             contentSize,
             nativeWidth,
             nativeHeight,
-            exifData: { error, data }
-        } = await Networking.PostToServer("/inspectImage", { source });
+            exifData: { error, data },
+        } = await Networking.PostToServer('/inspectImage', { source });
         document.exif = error || Doc.Get.FromJson({ data });
         const proto = Doc.GetProto(document);
-        nativeWidth && (document._height = NumCast(document._width) * nativeHeight / nativeWidth);
-        proto["data-nativeWidth"] = nativeWidth;
-        proto["data-nativeHeight"] = nativeHeight;
-        proto["data-path"] = source;
-        proto.contentSize = contentSize ? contentSize : undefined;
+        nativeWidth && (document._height = (NumCast(document._width) * nativeHeight) / nativeWidth);
+        proto['data_nativeWidth'] = nativeWidth;
+        proto['data_nativeHeight'] = nativeHeight;
+        proto['data-path'] = source;
+        proto.data_contentSize = contentSize ? contentSize : undefined;
         return data !== undefined;
     };
 
     export const ExportHierarchyToFileSystem = async (collection: Doc): Promise<void> => {
-        const a = document.createElement("a");
+        const a = document.createElement('a');
         a.href = Utils.prepend(`/imageHierarchyExport/${collection[Id]}`);
         a.download = `Dash Export [${StrCast(collection.title)}].zip`;
         a.click();
     };
-
-}
\ No newline at end of file
+}