chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].3
 - @standardnotes/[email protected].3
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].0
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].3
 - @standardnotes/[email protected].4
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].9

packages/api/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.5.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+### Features
+
+* **api:** add subscription server and client services and interfaces ([#1470](https://github.com/standardnotes/app/issues/1470)) ([089d3a2](https://github.com/standardnotes/app/commit/089d3a2e669f5a24bb4a38fc7582b423980d2d22))
+
 ## [1.4.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/api

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.4.9",
+  "version": "1.5.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -22,12 +22,14 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
+    "lint:fix": "eslint . --ext .ts --fix",
     "test": "jest spec --coverage"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",
     "@types/lodash": "^4.14.182",
     "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "eslint": "^8.23.0",
     "eslint-plugin-prettier": "*",
     "jest": "^28.1.2",
     "ts-jest": "^28.0.5"

packages/api/src/Domain/Client/Subscription/SubscriptionApiService.spec.ts

@@ -0,0 +1,63 @@
+import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+import { SubscriptionServerInterface } from '../../Server/Subscription/SubscriptionServerInterface'
+
+import { SubscriptionApiService } from './SubscriptionApiService'
+
+describe('SubscriptionApiService', () => {
+  let subscriptionServer: SubscriptionServerInterface
+
+  const createService = () => new SubscriptionApiService(subscriptionServer)
+
+  beforeEach(() => {
+    subscriptionServer = {} as jest.Mocked<SubscriptionServerInterface>
+    subscriptionServer.invite = jest.fn().mockReturnValue({
+      data: { success: true, sharedSubscriptionInvitationUuid: '1-2-3' },
+    } as jest.Mocked<SubscriptionInviteResponse>)
+  })
+
+  it('should invite a user', async () => {
+    const response = await createService().invite('[email protected]')
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+        sharedSubscriptionInvitationUuid: '1-2-3',
+      },
+    })
+    expect(subscriptionServer.invite).toHaveBeenCalledWith({
+      api: '20200115',
+      identifier: '[email protected]',
+    })
+  })
+
+  it('should not invite a user if it is already inviting', async () => {
+    const service = createService()
+    Object.defineProperty(service, 'inviting', {
+      get: () => true,
+    })
+
+    let error = null
+    try {
+      await service.invite('[email protected]')
+    } catch (caughtError) {
+      error = caughtError
+    }
+
+    expect(error).not.toBeNull()
+  })
+
+  it('should not invite a user if the server fails', async () => {
+    subscriptionServer.invite = jest.fn().mockImplementation(() => {
+      throw new Error('Oops')
+    })
+
+    let error = null
+    try {
+      await createService().invite('[email protected]')
+    } catch (caughtError) {
+      error = caughtError
+    }
+
+    expect(error).not.toBeNull()
+  })
+})

packages/api/src/Domain/Client/Subscription/SubscriptionApiService.ts

@@ -0,0 +1,35 @@
+import { ErrorMessage } from '../../Error/ErrorMessage'
+import { ApiCallError } from '../../Error/ApiCallError'
+import { ApiVersion } from '../../Api/ApiVersion'
+import { ApiEndpointParam } from '../../Request/ApiEndpointParam'
+import { SubscriptionApiServiceInterface } from './SubscriptionApiServiceInterface'
+import { SubscriptionServerInterface } from '../../Server/Subscription/SubscriptionServerInterface'
+import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+
+export class SubscriptionApiService implements SubscriptionApiServiceInterface {
+  private inviting: boolean
+
+  constructor(private subscriptionServer: SubscriptionServerInterface) {
+    this.inviting = false
+  }
+
+  async invite(inviteeEmail: string): Promise<SubscriptionInviteResponse> {
+    if (this.inviting) {
+      throw new ApiCallError(ErrorMessage.InvitingInProgress)
+    }
+    this.inviting = true
+
+    try {
+      const response = await this.subscriptionServer.invite({
+        [ApiEndpointParam.ApiVersion]: ApiVersion.v0,
+        identifier: inviteeEmail,
+      })
+
+      this.inviting = false
+
+      return response
+    } catch (error) {
+      throw new ApiCallError(ErrorMessage.GenericFail)
+    }
+  }
+}

packages/api/src/Domain/Client/Subscription/SubscriptionApiServiceInterface.ts

@@ -0,0 +1,5 @@
+import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+
+export interface SubscriptionApiServiceInterface {
+  invite(inviteeEmail: string): Promise<SubscriptionInviteResponse>
+}

packages/api/src/Domain/Client/index.ts

@@ -1,2 +1,4 @@
+export * from './Subscription/SubscriptionApiService'
+export * from './Subscription/SubscriptionApiServiceInterface'
 export * from './User/UserApiService'
 export * from './User/UserApiServiceInterface'

packages/api/src/Domain/Error/ErrorMessage.ts

@@ -1,7 +1,9 @@
 export enum ErrorMessage {
+  InvitingInProgress = 'An existing invitation request is already in progress.',
   RegistrationInProgress = 'An existing registration request is already in progress.',
   GenericRegistrationFail = 'A server error occurred while trying to register. Please try again.',
   RateLimited = 'Too many successive server requests. Please wait a few minutes and try again.',
   InsufficientPasswordMessage = 'Your password must be at least %LENGTH% characters in length. For your security, please choose a longer password or, ideally, a passphrase, and try again.',
   PasscodeRequired = 'Your passcode is required in order to register for an account.',
+  GenericFail = 'A server error occurred. Please try again.',
 }

packages/api/src/Domain/Request/Subscription/SubscriptionInviteAcceptRequestParams.ts

@@ -0,0 +1,10 @@
+import { Uuid } from '@standardnotes/common'
+
+import { ApiEndpointParam } from '../ApiEndpointParam'
+import { ApiVersion } from '../../Api/ApiVersion'
+
+export type SubscriptionInviteAcceptRequestParams = {
+  [ApiEndpointParam.ApiVersion]: ApiVersion.v0
+  inviteUuid: Uuid
+  [additionalParam: string]: unknown
+}

packages/api/src/Domain/Request/Subscription/SubscriptionInviteCancelRequestParams.ts

@@ -0,0 +1,10 @@
+import { Uuid } from '@standardnotes/common'
+
+import { ApiEndpointParam } from '../ApiEndpointParam'
+import { ApiVersion } from '../../Api/ApiVersion'
+
+export type SubscriptionInviteCancelRequestParams = {
+  [ApiEndpointParam.ApiVersion]: ApiVersion.v0
+  inviteUuid: Uuid
+  [additionalParam: string]: unknown
+}

packages/api/src/Domain/Request/Subscription/SubscriptionInviteDeclineRequestParams.ts

@@ -0,0 +1,10 @@
+import { Uuid } from '@standardnotes/common'
+
+import { ApiEndpointParam } from '../ApiEndpointParam'
+import { ApiVersion } from '../../Api/ApiVersion'
+
+export type SubscriptionInviteDeclineRequestParams = {
+  [ApiEndpointParam.ApiVersion]: ApiVersion.v0
+  inviteUuid: Uuid
+  [additionalParam: string]: unknown
+}

packages/api/src/Domain/Request/Subscription/SubscriptionInviteListRequestParams.ts

@@ -0,0 +1,7 @@
+import { ApiEndpointParam } from '../ApiEndpointParam'
+import { ApiVersion } from '../../Api/ApiVersion'
+
+export type SubscriptionInviteListRequestParams = {
+  [ApiEndpointParam.ApiVersion]: ApiVersion.v0
+  [additionalParam: string]: unknown
+}

packages/api/src/Domain/Request/Subscription/SubscriptionInviteRequestParams.ts

@@ -0,0 +1,8 @@
+import { ApiEndpointParam } from '../ApiEndpointParam'
+import { ApiVersion } from '../../Api/ApiVersion'
+
+export type SubscriptionInviteRequestParams = {
+  [ApiEndpointParam.ApiVersion]: ApiVersion.v0
+  identifier: string
+  [additionalParam: string]: unknown
+}

packages/api/src/Domain/Request/index.ts

@@ -1,2 +1,7 @@
 export * from './ApiEndpointParam'
+export * from './Subscription/SubscriptionInviteAcceptRequestParams'
+export * from './Subscription/SubscriptionInviteCancelRequestParams'
+export * from './Subscription/SubscriptionInviteDeclineRequestParams'
+export * from './Subscription/SubscriptionInviteListRequestParams'
+export * from './Subscription/SubscriptionInviteRequestParams'
 export * from './User/UserRegistrationRequestParams'

packages/api/src/Domain/Response/Subscription/SubscriptionInviteAcceptResponse.ts

@@ -0,0 +1,7 @@
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteAcceptResponseBody } from './SubscriptionInviteAcceptResponseBody'
+
+export interface SubscriptionInviteAcceptResponse extends HttpResponse {
+  data: SubscriptionInviteAcceptResponseBody | HttpErrorResponseBody
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteAcceptResponseBody.ts

@@ -0,0 +1,3 @@
+export type SubscriptionInviteAcceptResponseBody = {
+  success: boolean
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteCancelResponse.ts

@@ -0,0 +1,7 @@
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteCancelResponseBody } from './SubscriptionInviteCancelResponseBody'
+
+export interface SubscriptionInviteCancelResponse extends HttpResponse {
+  data: SubscriptionInviteCancelResponseBody | HttpErrorResponseBody
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteCancelResponseBody.ts

@@ -0,0 +1,3 @@
+export type SubscriptionInviteCancelResponseBody = {
+  success: boolean
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteDeclineResponse.ts

@@ -0,0 +1,7 @@
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteDeclineResponseBody } from './SubscriptionInviteDeclineResponseBody'
+
+export interface SubscriptionInviteDeclineResponse extends HttpResponse {
+  data: SubscriptionInviteDeclineResponseBody | HttpErrorResponseBody
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteDeclineResponseBody.ts

@@ -0,0 +1,3 @@
+export type SubscriptionInviteDeclineResponseBody = {
+  success: boolean
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteListResponse.ts

@@ -0,0 +1,7 @@
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteListResponseBody } from './SubscriptionInviteListResponseBody'
+
+export interface SubscriptionInviteListResponse extends HttpResponse {
+  data: SubscriptionInviteListResponseBody | HttpErrorResponseBody
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteListResponseBody.ts

@@ -0,0 +1,5 @@
+import { Invitation } from '@standardnotes/models'
+
+export type SubscriptionInviteListResponseBody = {
+  invitations: Array<Invitation>
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteResponse.ts

@@ -0,0 +1,7 @@
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteResponseBody } from './SubscriptionInviteResponseBody'
+
+export interface SubscriptionInviteResponse extends HttpResponse {
+  data: SubscriptionInviteResponseBody | HttpErrorResponseBody
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteResponseBody.ts

@@ -0,0 +1,10 @@
+import { Uuid } from '@standardnotes/common'
+
+export type SubscriptionInviteResponseBody =
+  | {
+      success: true
+      sharedSubscriptionInvitationUuid: Uuid
+    }
+  | {
+      success: false
+    }

packages/api/src/Domain/Response/index.ts

@@ -1,2 +1,12 @@
+export * from './Subscription/SubscriptionInviteAcceptResponse'
+export * from './Subscription/SubscriptionInviteAcceptResponseBody'
+export * from './Subscription/SubscriptionInviteCancelResponse'
+export * from './Subscription/SubscriptionInviteCancelResponseBody'
+export * from './Subscription/SubscriptionInviteDeclineResponse'
+export * from './Subscription/SubscriptionInviteDeclineResponseBody'
+export * from './Subscription/SubscriptionInviteListResponse'
+export * from './Subscription/SubscriptionInviteListResponseBody'
+export * from './Subscription/SubscriptionInviteResponse'
+export * from './Subscription/SubscriptionInviteResponseBody'
 export * from './User/UserRegistrationResponse'
 export * from './User/UserRegistrationResponseBody'

packages/api/src/Domain/Server/Subscription/Paths.ts

@@ -0,0 +1,15 @@
+import { Uuid } from '@standardnotes/common'
+
+const SharingPaths = {
+  invite: '/v1/subscription-invites',
+  acceptInvite: (inviteUuid: Uuid) => `/v1/subscription-invites/${inviteUuid}/accept`,
+  declineInvite: (inviteUuid: Uuid) => `/v1/subscription-invites/${inviteUuid}/decline`,
+  cancelInvite: (inviteUuid: Uuid) => `/v1/subscription-invites/${inviteUuid}`,
+  listInvites: '/v1/subscription-invites',
+}
+
+export const Paths = {
+  v1: {
+    ...SharingPaths,
+  },
+}

packages/api/src/Domain/Server/Subscription/SubscriptionServer.spec.ts

@@ -0,0 +1,105 @@
+import { Invitation } from '@standardnotes/models'
+
+import { ApiVersion } from '../../Api'
+import { HttpServiceInterface } from '../../Http'
+import { SubscriptionInviteResponse } from '../../Response'
+import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse'
+import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
+import { SubscriptionInviteDeclineResponse } from '../../Response/Subscription/SubscriptionInviteDeclineResponse'
+import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
+import { SubscriptionServer } from './SubscriptionServer'
+
+describe('SubscriptionServer', () => {
+  let httpService: HttpServiceInterface
+
+  const createServer = () => new SubscriptionServer(httpService)
+
+  beforeEach(() => {
+    httpService = {} as jest.Mocked<HttpServiceInterface>
+  })
+
+  it('should invite a user to a shared subscription', async () => {
+    httpService.post = jest.fn().mockReturnValue({
+      data: { success: true, sharedSubscriptionInvitationUuid: '1-2-3' },
+    } as jest.Mocked<SubscriptionInviteResponse>)
+
+    const response = await createServer().invite({
+      api: ApiVersion.v0,
+      identifier: '[email protected]',
+    })
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+        sharedSubscriptionInvitationUuid: '1-2-3',
+      },
+    })
+  })
+
+  it('should accept an invite to a shared subscription', async () => {
+    httpService.get = jest.fn().mockReturnValue({
+      data: { success: true },
+    } as jest.Mocked<SubscriptionInviteAcceptResponse>)
+
+    const response = await createServer().acceptInvite({
+      api: ApiVersion.v0,
+      inviteUuid: '1-2-3',
+    })
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+      },
+    })
+  })
+
+  it('should decline an invite to a shared subscription', async () => {
+    httpService.get = jest.fn().mockReturnValue({
+      data: { success: true },
+    } as jest.Mocked<SubscriptionInviteDeclineResponse>)
+
+    const response = await createServer().declineInvite({
+      api: ApiVersion.v0,
+      inviteUuid: '1-2-3',
+    })
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+      },
+    })
+  })
+
+  it('should cancel an invite to a shared subscription', async () => {
+    httpService.delete = jest.fn().mockReturnValue({
+      data: { success: true },
+    } as jest.Mocked<SubscriptionInviteCancelResponse>)
+
+    const response = await createServer().cancelInvite({
+      api: ApiVersion.v0,
+      inviteUuid: '1-2-3',
+    })
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+      },
+    })
+  })
+
+  it('should list invitations to a shared subscription', async () => {
+    httpService.get = jest.fn().mockReturnValue({
+      data: { invitations: [{} as jest.Mocked<Invitation>] },
+    } as jest.Mocked<SubscriptionInviteListResponse>)
+
+    const response = await createServer().listInvites({
+      api: ApiVersion.v0,
+    })
+
+    expect(response).toEqual({
+      data: {
+        invitations: [{} as jest.Mocked<Invitation>],
+      },
+    })
+  })
+})

packages/api/src/Domain/Server/Subscription/SubscriptionServer.ts

@@ -0,0 +1,48 @@
+import { HttpServiceInterface } from '../../Http/HttpServiceInterface'
+import { SubscriptionInviteAcceptRequestParams } from '../../Request/Subscription/SubscriptionInviteAcceptRequestParams'
+import { SubscriptionInviteCancelRequestParams } from '../../Request/Subscription/SubscriptionInviteCancelRequestParams'
+import { SubscriptionInviteDeclineRequestParams } from '../../Request/Subscription/SubscriptionInviteDeclineRequestParams'
+import { SubscriptionInviteListRequestParams } from '../../Request/Subscription/SubscriptionInviteListRequestParams'
+import { SubscriptionInviteRequestParams } from '../../Request/Subscription/SubscriptionInviteRequestParams'
+import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse'
+import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
+import { SubscriptionInviteDeclineResponse } from '../../Response/Subscription/SubscriptionInviteDeclineResponse'
+import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
+import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+
+import { Paths } from './Paths'
+import { SubscriptionServerInterface } from './SubscriptionServerInterface'
+
+export class SubscriptionServer implements SubscriptionServerInterface {
+  constructor(private httpService: HttpServiceInterface) {}
+
+  async acceptInvite(params: SubscriptionInviteAcceptRequestParams): Promise<SubscriptionInviteAcceptResponse> {
+    const response = await this.httpService.get(Paths.v1.acceptInvite(params.inviteUuid), params)
+
+    return response as SubscriptionInviteAcceptResponse
+  }
+
+  async declineInvite(params: SubscriptionInviteDeclineRequestParams): Promise<SubscriptionInviteDeclineResponse> {
+    const response = await this.httpService.get(Paths.v1.declineInvite(params.inviteUuid), params)
+
+    return response as SubscriptionInviteDeclineResponse
+  }
+
+  async cancelInvite(params: SubscriptionInviteCancelRequestParams): Promise<SubscriptionInviteCancelResponse> {
+    const response = await this.httpService.delete(Paths.v1.cancelInvite(params.inviteUuid), params)
+
+    return response as SubscriptionInviteCancelResponse
+  }
+
+  async listInvites(params: SubscriptionInviteListRequestParams): Promise<SubscriptionInviteListResponse> {
+    const response = await this.httpService.get(Paths.v1.listInvites, params)
+
+    return response as SubscriptionInviteListResponse
+  }
+
+  async invite(params: SubscriptionInviteRequestParams): Promise<SubscriptionInviteResponse> {
+    const response = await this.httpService.post(Paths.v1.invite, params)
+
+    return response as SubscriptionInviteResponse
+  }
+}

packages/api/src/Domain/Server/Subscription/SubscriptionServerInterface.ts

@@ -0,0 +1,18 @@
+import { SubscriptionInviteAcceptRequestParams } from '../../Request/Subscription/SubscriptionInviteAcceptRequestParams'
+import { SubscriptionInviteCancelRequestParams } from '../../Request/Subscription/SubscriptionInviteCancelRequestParams'
+import { SubscriptionInviteDeclineRequestParams } from '../../Request/Subscription/SubscriptionInviteDeclineRequestParams'
+import { SubscriptionInviteListRequestParams } from '../../Request/Subscription/SubscriptionInviteListRequestParams'
+import { SubscriptionInviteRequestParams } from '../../Request/Subscription/SubscriptionInviteRequestParams'
+import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse'
+import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
+import { SubscriptionInviteDeclineResponse } from '../../Response/Subscription/SubscriptionInviteDeclineResponse'
+import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
+import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+
+export interface SubscriptionServerInterface {
+  invite(params: SubscriptionInviteRequestParams): Promise<SubscriptionInviteResponse>
+  acceptInvite(params: SubscriptionInviteAcceptRequestParams): Promise<SubscriptionInviteAcceptResponse>
+  declineInvite(params: SubscriptionInviteDeclineRequestParams): Promise<SubscriptionInviteDeclineResponse>
+  cancelInvite(params: SubscriptionInviteCancelRequestParams): Promise<SubscriptionInviteCancelResponse>
+  listInvites(params: SubscriptionInviteListRequestParams): Promise<SubscriptionInviteListResponse>
+}

packages/desktop/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.23.105](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.104](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-29)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.103](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.102](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.23.101](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.23.101",
+  "version": "3.23.105",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/encryption/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.14.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
 ## [1.14.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/encryption

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/filepicker/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
 ## [1.22.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/filepicker

packages/filepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/filepicker",
-  "version": "1.22.2",
+  "version": "1.22.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/files/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/files
+
 ## [1.9.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/files

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/mobile/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.31.21](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.20](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-29)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.19](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-25)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.31.17](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.31.17",
+  "version": "3.31.21",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0-or-later",

packages/models/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.17.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+### Features
+
+* **api:** add subscription server and client services and interfaces ([#1470](https://github.com/standardnotes/app/issues/1470)) ([089d3a2](https://github.com/standardnotes/app/commit/089d3a2e669f5a24bb4a38fc7582b423980d2d22))
+
 ## [1.16.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/models

packages/models/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/models",
-  "version": "1.16.2",
+  "version": "1.17.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/models/src/Domain/Api/Subscription/Invitation.ts

@@ -0,0 +1,15 @@
+import { InvitationStatus } from './InvitationStatus'
+import { InviteeIdentifierType } from './InviteeIdentifierType'
+import { InviterIdentifierType } from './InviterIdentifierType'
+
+export type Invitation = {
+  uuid: string
+  inviterIdentifier: string
+  inviterIdentifierType: InviterIdentifierType
+  inviteeIdentifier: string
+  inviteeIdentifierType: InviteeIdentifierType
+  status: InvitationStatus
+  subscriptionId: number
+  createdAt: number
+  updatedAt: number
+}

packages/models/src/Domain/Api/Subscription/InvitationStatus.ts

@@ -0,0 +1,6 @@
+export enum InvitationStatus {
+  Sent = 'sent',
+  Canceled = 'canceled',
+  Accepted = 'accepted',
+  Declined = 'declined',
+}

packages/models/src/Domain/Api/Subscription/InviteeIdentifierType.ts

@@ -0,0 +1,5 @@
+export enum InviteeIdentifierType {
+  Email = 'email',
+  Hash = 'hash',
+  Uuid = 'uuid',
+}

packages/models/src/Domain/Api/Subscription/InviterIdentifierType.ts

@@ -0,0 +1,4 @@
+export enum InviterIdentifierType {
+  Email = 'email',
+  Uuid = 'uuid',
+}

packages/models/src/Domain/index.ts

@@ -24,6 +24,10 @@ export * from './Abstract/Contextual/SessionHistory'
 export * from './Abstract/Item'
 export * from './Abstract/Payload'
 export * from './Abstract/TransferPayload'
+export * from './Api/Subscription/Invitation'
+export * from './Api/Subscription/InvitationStatus'
+export * from './Api/Subscription/InviteeIdentifierType'
+export * from './Api/Subscription/InviterIdentifierType'
 export * from './Local/KeyParams/RootKeyParamsInterface'
 export * from './Local/RootKey/KeychainTypes'
 export * from './Local/RootKey/RootKeyContent'

packages/releases/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.27](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.26](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-29)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.25](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-25)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.24](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.3.23](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.3.23",
+  "version": "1.3.27",
   "license": "AGPL-3.0-or-later",
   "main": "dist/releases.json",
   "types": "dist/index.d.ts",

packages/services/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/services
+
 ## [1.17.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 ### Bug Fixes

packages/services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/services",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/snjs/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.125.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.125.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+### Bug Fixes
+
+* **snjs:** showing archived notes on trashed smart view ([#1426](https://github.com/standardnotes/app/issues/1426)) ([2c69a51](https://github.com/standardnotes/app/commit/2c69a514a8a2c3cfe713e118bb6997f21e41ebe8))
+
 ## [2.125.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/snjs

packages/snjs/lib/Services/Items/ItemManager.spec.ts

@@ -11,6 +11,8 @@ import {
   FillItemContent,
   PayloadTimestampDefaults,
   NoteContent,
+  SmartView,
+  SystemViewId,
 } from '@standardnotes/models'
 
 const setupRandomUuid = () => {
@@ -179,6 +181,39 @@ describe('itemManager', () => {
       const notes = itemManager.getDisplayableNotes()
       expect(notes).toHaveLength(1)
     })
+
+    it('viewing trashed notes smart view should include archived notes', async () => {
+      itemManager = createService()
+
+      const archivedNote = createNote('archived')
+      const trashedNote = createNote('trashed')
+      const archivedAndTrashedNote = createNote('archived&trashed')
+
+      await itemManager.insertItems([archivedNote, trashedNote, archivedAndTrashedNote])
+
+      await itemManager.changeItem<Models.NoteMutator>(archivedNote, (m) => {
+        m.archived = true
+      })
+      await itemManager.changeItem<Models.NoteMutator>(trashedNote, (m) => {
+        m.trashed = true
+      })
+      await itemManager.changeItem<Models.NoteMutator>(archivedAndTrashedNote, (m) => {
+        m.trashed = true
+        m.archived = true
+      })
+
+      itemManager.setPrimaryItemDisplayOptions({
+        sortBy: 'title',
+        sortDirection: 'asc',
+        includeArchived: false,
+        includeTrashed: false,
+        views: [{ uuid: SystemViewId.TrashedNotes } as jest.Mocked<SmartView>],
+      })
+
+      const notes = itemManager.getDisplayableNotes()
+
+      expect(notes).toHaveLength(2)
+    })
   })
 
   describe('tag relationships', () => {

packages/snjs/lib/Services/Items/ItemManager.ts

@@ -127,20 +127,20 @@ export class ItemManager
     const override: Models.FilterDisplayOptions = {}
 
     if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.AllNotes)) {
-      if (options.includeArchived == undefined) {
+      if (options.includeArchived === undefined) {
         override.includeArchived = false
       }
-      if (options.includeTrashed == undefined) {
+      if (options.includeTrashed === undefined) {
         override.includeTrashed = false
       }
     }
     if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.ArchivedNotes)) {
-      if (options.includeTrashed == undefined) {
+      if (options.includeTrashed === undefined) {
         override.includeTrashed = false
       }
     }
     if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.TrashedNotes)) {
-      if (options.includeArchived == undefined) {
+      if (!options.includeArchived) {
         override.includeArchived = true
       }
     }

packages/snjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/snjs",
-  "version": "2.125.2",
+  "version": "2.125.4",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/ui-services/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
 ## [1.1.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/ui-services

packages/ui-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/ui-services",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/web/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.45.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.45.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-29)
+
+### Bug Fixes
+
+* tag autocomplete result not clickable on iOS ([#1455](https://github.com/standardnotes/app/issues/1455)) ([876c0e8](https://github.com/standardnotes/app/commit/876c0e83ca52d918854601b4929259711cc9a5eb))
+
+## [3.45.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-25)
+
+### Bug Fixes
+
+* editor content being hidden under keyboard on mobile ([#1410](https://github.com/standardnotes/app/issues/1410)) ([520b3ad](https://github.com/standardnotes/app/commit/520b3add0f8597c79706812c4819fb23a551becc))
+
+## [3.45.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/web
+
 ## [3.45.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
 
 **Note:** Version bump only for package @standardnotes/web

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web",
-  "version": "3.45.5",
+  "version": "3.45.9",
   "license": "AGPL-3.0-or-later",
   "main": "dist/app.js",
   "author": "Standard Notes.",

packages/web/src/javascripts/App.tsx

@@ -34,18 +34,13 @@ import { ApplicationGroup } from './Application/ApplicationGroup'
 import { WebOrDesktopDevice } from './Application/Device/WebOrDesktopDevice'
 import { WebApplication } from './Application/Application'
 import { createRoot, Root } from 'react-dom/client'
+import { ElementIds } from './Constants/ElementIDs'
 
 let keyCount = 0
 const getKey = () => {
   return keyCount++
 }
 
-const RootId = 'app-group-root'
-
-const setViewportHeight = () => {
-  document.documentElement.style.setProperty('--viewport-height', `${window.innerHeight}px`)
-}
-
 const startApplication: StartApplication = async function startApplication(
   defaultSyncServerHost: string,
   device: WebOrDesktopDevice,
@@ -58,24 +53,18 @@ const startApplication: StartApplication = async function startApplication(
   let root: Root
 
   const onDestroy = () => {
-    const rootElement = document.getElementById(RootId) as HTMLElement
+    const rootElement = document.getElementById(ElementIds.RootId) as HTMLElement
     root.unmount()
     rootElement.remove()
-    window.removeEventListener('resize', setViewportHeight)
-    window.removeEventListener('orientationchange', setViewportHeight)
     renderApp()
   }
 
   const renderApp = () => {
     const rootElement = document.createElement('div')
-    rootElement.id = RootId
+    rootElement.id = ElementIds.RootId
     const appendedRootNode = document.body.appendChild(rootElement)
     root = createRoot(appendedRootNode)
 
-    setViewportHeight()
-    window.addEventListener('resize', setViewportHeight)
-    window.addEventListener('orientationchange', setViewportHeight)
-
     disableIosTextFieldZoom()
 
     root.render(

packages/web/src/javascripts/Components/ComponentView/ComponentView.tsx

@@ -33,7 +33,7 @@ const VisibilityChangeKey = 'visibilitychange'
 const MSToWaitAfterIframeLoadToAvoidFlicker = 35
 
 const ComponentView: FunctionComponent<IProps> = ({ application, onLoad, componentViewer, requestReload }) => {
-  const iframeRef = useRef<HTMLIFrameElement>(null)
+  const iframeRef = useRef<HTMLIFrameElement | null>(null)
   const [loadTimeout, setLoadTimeout] = useState<ReturnType<typeof setTimeout> | undefined>(undefined)
 
   const [hasIssueLoading, setHasIssueLoading] = useState(false)
@@ -200,6 +200,7 @@ const ComponentView: FunctionComponent<IProps> = ({ application, onLoad, compone
       {error === ComponentViewerError.MissingUrl && <UrlMissing componentName={component.displayName} />}
       {component.uuid && isComponentValid && (
         <iframe
+          className="min-h-[40rem]"
           ref={iframeRef}
           onLoad={onIframeLoad}
           data-component-viewer-id={componentViewer.identifier}

packages/web/src/javascripts/Components/ContentListView/ContentList.tsx

@@ -68,8 +68,8 @@ const ContentList: FunctionComponent<Props> = ({
   return (
     <div
       className={classNames(
-        'infinite-scroll overflow-y-auto overflow-x-hidden focus:shadow-none focus:outline-none',
-        'md:overflow-y-hidden md:hover:overflow-y-auto',
+        'infinite-scroll max-h-[75vh] overflow-y-auto overflow-x-hidden focus:shadow-none focus:outline-none',
+        'md:max-h-full md:overflow-y-hidden md:hover:overflow-y-auto',
         'md:hover:[overflow-y:_overlay]',
       )}
       id={ElementIds.ContentList}

packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx

@@ -191,7 +191,7 @@ const ContentListView: FunctionComponent<Props> = ({
       aria-label={'Notes & Files'}
       ref={itemsViewPanelRef}
     >
-      <ResponsivePaneContent paneId={AppPaneId.Items}>
+      <ResponsivePaneContent paneId={AppPaneId.Items} contentClassName="min-h-[85vh]">
         <div id="items-title-bar" className="section-title-bar border-b border-solid border-border">
           <div id="items-title-bar-container">
             <input

packages/web/src/javascripts/Components/Navigation/Navigation.tsx

@@ -51,7 +51,11 @@ const Navigation: FunctionComponent<Props> = ({ application }) => {
       className={'sn-component section app-column w-[220px] xsm-only:!w-full sm-only:!w-full'}
       ref={ref}
     >
-      <ResponsivePaneContent paneId={AppPaneId.Navigation} contentElementId="navigation-content">
+      <ResponsivePaneContent
+        paneId={AppPaneId.Navigation}
+        contentElementId="navigation-content"
+        contentClassName="min-h-[85vh]"
+      >
         <div className={'section-title-bar'}>
           <div className="section-title-bar-header">
             <div className="title text-sm">

packages/web/src/javascripts/Components/NoteView/AutoresizingTextarea.tsx

@@ -0,0 +1,30 @@
+import { classNames } from '@/Utils/ConcatenateClassNames'
+import { ComponentPropsWithoutRef, ForwardedRef, forwardRef } from 'react'
+
+// Based on: https://css-tricks.com/auto-growing-inputs-textareas/#aa-other-ideas
+const AutoresizingNoteViewTextarea = forwardRef(
+  ({ value, ...textareaProps }: ComponentPropsWithoutRef<'textarea'>, ref: ForwardedRef<HTMLTextAreaElement>) => {
+    return (
+      <div className="relative inline-grid min-h-[75vh] w-full grid-rows-1 items-stretch md:block md:flex-grow">
+        <pre
+          id="textarea-mobile-resizer"
+          className={classNames(
+            'editable font-editor break-word whitespace-pre-wrap',
+            'invisible [grid-area:1_/_1] md:hidden',
+          )}
+          aria-hidden
+        >
+          {value}{' '}
+        </pre>
+        <textarea
+          value={value}
+          className="editable font-editor [grid-area:1_/_1] md:h-full md:min-h-0"
+          {...textareaProps}
+          ref={ref}
+        ></textarea>
+      </div>
+    )
+  },
+)
+
+export default AutoresizingNoteViewTextarea

packages/web/src/javascripts/Components/NoteView/NoteView.tsx

@@ -37,6 +37,7 @@ import { reloadFont } from './FontFunctions'
 import { NoteViewProps } from './NoteViewProps'
 import IndicatorCircle from '../IndicatorCircle/IndicatorCircle'
 import { classNames } from '@/Utils/ConcatenateClassNames'
+import AutoresizingNoteViewTextarea from './AutoresizingTextarea'
 
 const MINIMUM_STATUS_DURATION = 400
 const TEXTAREA_DEBOUNCE = 100
@@ -889,7 +890,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
 
     return (
       <div aria-label="Note" className="section editor sn-component">
-        <div className="flex flex-grow flex-col">
+        <div className="flex-grow flex-col md:flex">
           {this.state.noteLocked && (
             <EditingDisabledBanner
               onMouseLeave={() => {
@@ -1021,9 +1022,8 @@ class NoteView extends PureComponent<NoteViewProps, State> {
             )}
 
             {this.state.editorStateDidLoad && !this.state.editorComponentViewer && !this.state.textareaUnloading && (
-              <textarea
+              <AutoresizingNoteViewTextarea
                 autoComplete="off"
-                className="editable font-editor"
                 dir="auto"
                 id={ElementIds.NoteTextEditor}
                 onChange={this.onTextAreaChange}
@@ -1032,7 +1032,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
                 onFocus={this.onContentFocus}
                 spellCheck={this.state.spellcheck}
                 ref={(ref) => ref && this.onSystemEditorLoad(ref)}
-              ></textarea>
+              />
             )}
 
             {this.state.marginResizersEnabled && this.editorContentRef.current ? (

packages/web/src/javascripts/Components/Popover/PositionedPopoverContent.tsx

@@ -9,6 +9,8 @@ import { getPositionedPopoverStyles } from './GetPositionedPopoverStyles'
 import { PopoverContentProps } from './Types'
 import { getPopoverMaxHeight, getAppRect } from './Utils/Rect'
 import { usePopoverCloseOnClickOutside } from './Utils/usePopoverCloseOnClickOutside'
+import { fitNodeToMobileScreen } from '@/Utils'
+import { useDisableBodyScrollOnMobile } from '@/Hooks/useDisableBodyScrollOnMobile'
 
 const PositionedPopoverContent = ({
   align = 'end',
@@ -49,6 +51,8 @@ const PositionedPopoverContent = ({
     childPopovers,
   })
 
+  useDisableBodyScrollOnMobile()
+
   return (
     <Portal>
       <div
@@ -63,6 +67,7 @@ const PositionedPopoverContent = ({
         }}
         ref={(node) => {
           setPopoverElement(node)
+          fitNodeToMobileScreen(node)
         }}
         data-popover={id}
       >

packages/web/src/javascripts/Components/Preferences/PreferencesView.tsx

@@ -4,6 +4,8 @@ import { observer } from 'mobx-react-lite'
 import { PreferencesMenu } from './PreferencesMenu'
 import PreferencesCanvas from './PreferencesCanvas'
 import { PreferencesProps } from './PreferencesProps'
+import { fitNodeToMobileScreen } from '@/Utils'
+import { useDisableBodyScrollOnMobile } from '@/Hooks/useDisableBodyScrollOnMobile'
 
 const PreferencesView: FunctionComponent<PreferencesProps> = (props) => {
   const menu = useMemo(
@@ -25,8 +27,13 @@ const PreferencesView: FunctionComponent<PreferencesProps> = (props) => {
     }
   }, [props, menu])
 
+  useDisableBodyScrollOnMobile()
+
   return (
-    <div className="absolute top-0 left-0 z-preferences flex h-full w-full flex-col bg-contrast">
+    <div
+      className="absolute top-0 left-0 z-preferences flex h-full max-h-screen w-full flex-col bg-contrast"
+      ref={fitNodeToMobileScreen}
+    >
       <div className="flex w-full flex-row items-center justify-between border-b border-solid border-border bg-default px-3 py-2 md:p-3">
         <div className="hidden h-8 w-8 md:block" />
         <h1 className="text-base font-bold md:text-lg">Your preferences for Standard Notes</h1>

packages/web/src/javascripts/Components/Shared/ModalDialogButtons.tsx

@@ -1,5 +1,5 @@
 import { classNames } from '@/Utils/ConcatenateClassNames'
-import { FunctionComponent } from 'react'
+import { Fragment, FunctionComponent } from 'react'
 
 type Props = {
   className?: string
@@ -11,10 +11,10 @@ const ModalDialogButtons: FunctionComponent<Props> = ({ children, className }) =
     <div className={classNames('flex items-center justify-end px-4 py-4', className)}>
       {children != undefined && Array.isArray(children)
         ? children.map((child, idx, arr) => (
-            <>
+            <Fragment key={idx}>
               {child}
               {idx < arr.length - 1 ? <div className="min-w-3" /> : undefined}
-            </>
+            </Fragment>
           ))
         : children}
     </div>

packages/web/src/javascripts/Components/TagAutocomplete/AutocompleteTagInput.tsx

@@ -14,6 +14,8 @@ import AutocompleteTagResult from './AutocompleteTagResult'
 import AutocompleteTagHint from './AutocompleteTagHint'
 import { observer } from 'mobx-react-lite'
 import { SNTag } from '@standardnotes/snjs'
+import { classNames } from '@/Utils/ConcatenateClassNames'
+import { FOCUSABLE_BUT_NOT_TABBABLE } from '@/Constants/Constants'
 
 type Props = {
   viewControllerManager: ViewControllerManager
@@ -123,14 +125,16 @@ const AutocompleteTagInput = ({ viewControllerManager }: Props) => {
           />
           {dropdownVisible && (autocompleteTagResults.length > 0 || autocompleteTagHintVisible) && (
             <DisclosurePanel
-              className={`${
-                tags.length > 0 ? 'w-80' : 'mr-10 w-70'
-              } absolute flex flex-col rounded bg-default py-2 shadow-main`}
+              className={classNames(
+                tags.length > 0 ? 'w-80' : 'mr-10 w-70',
+                'absolute z-dropdown-menu flex flex-col rounded bg-default py-2 shadow-main',
+              )}
               style={{
                 maxHeight: dropdownMaxHeight,
                 maxWidth: tagsContainerMaxWidth,
               }}
               onBlur={closeOnBlur}
+              tabIndex={FOCUSABLE_BUT_NOT_TABBABLE}
             >
               <div className="md:overflow-y-auto">
                 {autocompleteTagResults.map((tagResult: SNTag) => (

packages/web/src/javascripts/Constants/ElementIDs.ts

@@ -8,4 +8,5 @@ export const ElementIds = {
   NavigationColumn: 'navigation',
   NoteTextEditor: 'note-text-editor',
   NoteTitleEditor: 'note-title-editor',
-}
+  RootId: 'app-group-root',
+} as const

packages/web/src/javascripts/Hooks/useDisableBodyScrollOnMobile.tsx

@@ -0,0 +1,27 @@
+import { isMobileScreen } from '@/Utils'
+import { useEffect, useRef } from 'react'
+
+/**
+ * Used to disable scroll on document.body when opening popovers or preferences view
+ * on mobile so that user can only scroll within the popover or prefs view
+ */
+export const useDisableBodyScrollOnMobile = () => {
+  const styleElementRef = useRef<HTMLStyleElement | null>(null)
+
+  useEffect(() => {
+    const isMobile = isMobileScreen()
+
+    if (isMobile && !styleElementRef.current) {
+      const styleElement = document.createElement('style')
+      styleElement.textContent = 'body { overflow: hidden; }'
+      document.body.appendChild(styleElement)
+      styleElementRef.current = styleElement
+    }
+
+    return () => {
+      if (isMobile && styleElementRef.current) {
+        styleElementRef.current.remove()
+      }
+    }
+  }, [])
+}

packages/web/src/javascripts/Utils/IsMobile.ts

@@ -1,28 +0,0 @@
-/**
- * source: https://github.com/juliangruber/is-mobile
- *
- * (MIT)
- * Copyright (c) 2013 Julian Gruber <julian@juliangruber.com>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-const mobileRE =
-  /(android|bb\d+|meego).+mobile|armv7l|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series[46]0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i
-
-const tabletRE = /android|ipad|playbook|silk/i
-
-export type Opts = {
-  tablet?: boolean
-}
-
-export const isMobile = (opts: Opts = {}) => {
-  const ua = navigator.userAgent || navigator.vendor
-
-  if (typeof ua !== 'string') {
-    return false
-  }
-
-  return mobileRE.test(ua) || (!!opts.tablet && tabletRE.test(ua))
-}

packages/web/src/javascripts/Utils/Utils.ts

@@ -2,8 +2,6 @@ import { Platform, platformFromString } from '@standardnotes/snjs'
 import { IsDesktopPlatform, IsWebPlatform } from '@/Constants/Version'
 import { EMAIL_REGEX } from '../Constants/Constants'
 
-export { isMobile } from './IsMobile'
-
 declare const process: {
   env: {
     NODE_ENV: string | null | undefined
@@ -203,3 +201,14 @@ export const disableIosTextFieldZoom = () => {
     addMaximumScaleToMetaViewport()
   }
 }
+
+export const isMobileScreen = () => !window.matchMedia('(min-width: 768px)').matches
+
+export const fitNodeToMobileScreen = (node: HTMLElement | null) => {
+  if (!node || !isMobileScreen()) {
+    return
+  }
+  node.style.height = `${visualViewport.height}px`
+  node.style.position = 'absolute'
+  node.style.top = `${document.documentElement.scrollTop}px`
+}

packages/web/src/javascripts/Utils/index.ts

@@ -1,4 +1,3 @@
 export * from './ConcatenateUint8Arrays'
-export * from './IsMobile'
 export * from './StringUtils'
 export * from './Utils'

packages/web/src/stylesheets/_columns.scss

@@ -21,7 +21,6 @@
       flex-grow: 1;
 
       .content {
-        height: 100%;
         overflow-y: auto;
       }
     }

packages/web/src/stylesheets/_editor.scss

@@ -9,6 +9,7 @@ $heading-height: 75px;
 .section.editor {
   display: flex;
   flex-direction: column;
+  flex-grow: 1;
   overflow-y: hidden;
   background-color: var(--editor-background-color);
   color: var(--editor-foreground-color);
@@ -95,8 +96,6 @@ $heading-height: 75px;
 .editor-content,
 #editor-content {
   flex: 1;
-  overflow-y: hidden;
-  height: 100%;
   display: flex;
   tab-size: 2;
   background-color: var(--editor-pane-background-color);

packages/web/src/stylesheets/_main.scss

@@ -41,8 +41,6 @@ body {
   -moz-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
-  min-height: 100%;
-  height: 100%;
   line-height: normal;
   margin: 0;
 }
@@ -107,16 +105,30 @@ p {
   margin: 0;
 }
 
+html,
+body,
+.main-ui-view {
+  height: max-content;
+  min-height: 0;
+  max-height: none;
+
+  display: block;
+
+  @media screen and (min-width: 768px) {
+    display: flex;
+    flex-direction: column;
+  }
+}
+
 .main-ui-view {
-  // Fallbacks
-  min-height: 100vh;
-  height: 100vh;
-  // Mobile-corrected viewport height
-  min-height: var(--viewport-height);
-  height: var(--viewport-height);
   position: relative;
   overflow: auto;
   background-color: var(--editor-header-bar-background-color);
+
+  @media screen and (min-width: 768px) {
+    min-height: 100vh;
+    height: 100vh;
+  }
 }
 
 $footer-height: 2rem;
@@ -139,8 +151,6 @@ $footer-height: 2rem;
 
   .section {
     padding-bottom: 0px;
-    height: 100%;
-    max-height: calc(100vh - #{$footer-height});
     position: relative;
     overflow: hidden;
 

yarn.lock

@@ -3463,6 +3463,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint/eslintrc@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "@eslint/eslintrc@npm:1.3.1"
+  dependencies:
+    ajv: ^6.12.4
+    debug: ^4.3.2
+    espree: ^9.4.0
+    globals: ^13.15.0
+    ignore: ^5.2.0
+    import-fresh: ^3.2.1
+    js-yaml: ^4.1.0
+    minimatch: ^3.1.2
+    strip-json-comments: ^3.1.1
+  checksum: 9844dcc58a44399649926d5a17a2d53d529b80d3e8c3e9d0964ae198bac77ee6bb1cf44940f30cd9c2e300f7568ec82500be42ace6cacefb08aebf9905fe208e
+  languageName: node
+  linkType: hard
+
 "@expo/react-native-action-sheet@npm:^3.13.0":
   version: 3.13.0
   resolution: "@expo/react-native-action-sheet@npm:3.13.0"
@@ -3538,6 +3555,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@humanwhocodes/module-importer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@humanwhocodes/module-importer@npm:1.0.1"
+  checksum: 0fd22007db8034a2cdf2c764b140d37d9020bbfce8a49d3ec5c05290e77d4b0263b1b972b752df8c89e5eaa94073408f2b7d977aed131faf6cf396ebb5d7fb61
+  languageName: node
+  linkType: hard
+
 "@humanwhocodes/object-schema@npm:^1.2.0, @humanwhocodes/object-schema@npm:^1.2.1":
   version: 1.2.1
   resolution: "@humanwhocodes/object-schema@npm:1.2.1"
@@ -6216,6 +6240,7 @@ __metadata:
     "@types/jest": ^28.1.5
     "@types/lodash": ^4.14.182
     "@typescript-eslint/eslint-plugin": ^5.30.0
+    eslint: ^8.23.0
     eslint-plugin-prettier: "*"
     jest: ^28.1.2
     reflect-metadata: ^0.1.13
@@ -18026,6 +18051,55 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint@npm:^8.23.0":
+  version: 8.23.0
+  resolution: "eslint@npm:8.23.0"
+  dependencies:
+    "@eslint/eslintrc": ^1.3.1
+    "@humanwhocodes/config-array": ^0.10.4
+    "@humanwhocodes/gitignore-to-minimatch": ^1.0.2
+    "@humanwhocodes/module-importer": ^1.0.1
+    ajv: ^6.10.0
+    chalk: ^4.0.0
+    cross-spawn: ^7.0.2
+    debug: ^4.3.2
+    doctrine: ^3.0.0
+    escape-string-regexp: ^4.0.0
+    eslint-scope: ^7.1.1
+    eslint-utils: ^3.0.0
+    eslint-visitor-keys: ^3.3.0
+    espree: ^9.4.0
+    esquery: ^1.4.0
+    esutils: ^2.0.2
+    fast-deep-equal: ^3.1.3
+    file-entry-cache: ^6.0.1
+    find-up: ^5.0.0
+    functional-red-black-tree: ^1.0.1
+    glob-parent: ^6.0.1
+    globals: ^13.15.0
+    globby: ^11.1.0
+    grapheme-splitter: ^1.0.4
+    ignore: ^5.2.0
+    import-fresh: ^3.0.0
+    imurmurhash: ^0.1.4
+    is-glob: ^4.0.0
+    js-yaml: ^4.1.0
+    json-stable-stringify-without-jsonify: ^1.0.1
+    levn: ^0.4.1
+    lodash.merge: ^4.6.2
+    minimatch: ^3.1.2
+    natural-compare: ^1.4.0
+    optionator: ^0.9.1
+    regexpp: ^3.2.0
+    strip-ansi: ^6.0.1
+    strip-json-comments: ^3.1.0
+    text-table: ^0.2.0
+  bin:
+    eslint: bin/eslint.js
+  checksum: ff6075daa28d817a7ac4508f31bc108a04d9ab5056608c8651b5bf9cfea5d708ca16dea6cdab2c3c0ae99b0bf0e726af8504eaa8e17c8e12e242cb68237ead64
+  languageName: node
+  linkType: hard
+
 "espree@npm:^7.3.0, espree@npm:^7.3.1":
   version: 7.3.1
   resolution: "espree@npm:7.3.1"
@@ -18059,6 +18133,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"espree@npm:^9.4.0":
+  version: 9.4.0
+  resolution: "espree@npm:9.4.0"
+  dependencies:
+    acorn: ^8.8.0
+    acorn-jsx: ^5.3.2
+    eslint-visitor-keys: ^3.3.0
+  checksum: 2e3020dde67892d2ba3632413b44d0dc31d92c29ce72267d7ec24216a562f0a6494d3696e2fa39a3ec8c0e0088d773947ab2925fbb716801a11eb8dd313ac89c
+  languageName: node
+  linkType: hard
+
 "esprima@npm:^4.0.0, esprima@npm:^4.0.1, esprima@npm:~4.0.0":
   version: 4.0.1
   resolution: "esprima@npm:4.0.1"