feat(expand): better dimension calc and support for canvas